Catchup to Master #7

Hopefully added the boulder to the region settings.

Mythological V2

game_ui::init_ui() is doing much more than redrawing. Discard handle_redraw(). Fixes #35631.

Fix issue of translating sling, add ctxt to sling when it is weapon. …

fix typo autopiot

* Jerky no longer cooks_like cooked meat * Remove proportional price Updated price entry as well, to keep jerky at $3.20.

* Tweak description for dispatch robots. * Update defense_bot.json

Fix the description for bio_evap item

Since chicken walkers explode I didn't want the player to get a complete body with all parts working and salvageable, but there were several items that are required for an existing rebuild a chicken walker recipe that don't drop anyone under any conditions. So now there is a chance they can drop.

Fix clang-tidy regression

Lower photophore cost by 1 point

Stop NPC asking for tool selection when repairing

Fixed terminal settings saving

…eset

…_like.

…ting tool for making soap flakes.

following amurkin's suggested change Co-Authored-By: Alexey Mostovoy <1931904+AMurkin@users.noreply.github.com>

applying amurkin's suggested change Co-Authored-By: Alexey Mostovoy <1931904+AMurkin@users.noreply.github.com>

* Change military buildings overmap color to red. * Change mine entrance overmap color to magenta

This commit is meant to add support for a later PR that adds the ability to make shaved soap and use that for vehicle washing machines.

use functions that use item_location instead of int in game::inventory_item_menu()

* Add "RAW" flag which reduces calories 25% Raw food takes more energy for your digestive system to break down, and thus means less net energy. Research on the subject is still ongoing, but a 33% increase from to cooking seems a decent guess. This is implemented as a 25% decrease to food with the "RAW" flag. When the food is cooked (used in any recipe with a heat source) this penalty is removed. Otherwise, it persists through crafting. * Remove RAW flag from various foods Sugars and fats are not easier to digest after cooking, so removed RAW flag from foods that derive most of their calories from these sources. * Document criteria for RAW flag Also added a TODO regarding making these criteria a unit test once the infrastructure to do so is in place.

* Using bio_teleport removes grabbed effect * any succesful teleport removes grabbed effect

* add ability to search through filter by item notes with n:

Add extra makeshift magazines

Fix martini recipe category

Dirty transparency cache when a mapregen trap is activated

Previously, migrating a count_by_charges item to another count_by_charges item would result in the new item being given its default amount of charges, no matter the charges of the original. This changes that so that unless a "charges" value is specified in the migration definition, the charges of the original are preserved.

Remove CR

Minor magazine tweaks

The arguments given are "string, int, int", but the format string expects "int, int, string". This adds explicit numbers to the format specifiers to match the actual arguments.

Fix arguments in string_format call:

Fixed a typo

* include plcaeholder text to remove confusion * punctuation consistency

…-fix Avoid undefined behavior when filtering elements from a set

…t-ids Remove unused effect id declarations

Fix migration behavior for charges

* Fix field effect definition in Magiclysm mod * Update dragon.json

Refactor 2D/point overloads of map functions

* Coarse correction to drench rate from precipitation * every 6 seconds instead of random chance

* Allow shooting out lights in the lab. * One in 3 chance to hit the light.

* Expand mi-go speech * add some barks

* Add mi-go atmosphere effect * Regional settings expansion * Update effects.json * forgot to add urban groundcover tweak regular groundcover while at it. * integrate pseudo terrains into more terrain types * fix errors caught on playtest * lint regional map settings

* re-added soap flakes for use in washing machines after another hard reset * add a name_plural fiel to soap flakes and relinted both json files * shortened the time for crafting soap flakes to 15 m and added a looks_like. * added a second slightly faster crafting recipe for a higher level cutting tool for making soap flakes. * fixed the linting on chems and resources. * changed the difficulty of the recipe for soap flakes to 0. * Update data/json/recipes/recipe_medsandchemicals.json following amurkin's suggested change Co-Authored-By: Alexey Mostovoy <1931904+AMurkin@users.noreply.github.com> * Update data/json/recipes/recipe_medsandchemicals.json applying amurkin's suggested change Co-Authored-By: Alexey Mostovoy <1931904+AMurkin@users.noreply.github.com> * Add DETERGENT flag to soap flakes * linting fix

Graphical Overmap

* Replace ... with …

* Fix bio_solar * Don't display sunlight as fuel when under the sun

- moved comments to separate lines; - removed redundant comments.

#35456 was poorly reviewed and a significant tweak to electric jackhammers was included with no justification given. This flew in the face of the carefully considered overhaul in #31192.

Fix infinite leather exploit from large tactical backpack

Revert buff to electric jackhammers

Style comments (2019-11-28)

Remove unused function

* Gave empty window frame coverage * Give coverage to base window Added coverage to base window because the smashed version suddenly gains coverage.

Refactor iexamine::slot_machine

* Allow browsing vending-machine items without a cash card * Edit vending-machine messages

* rearrange park.json * add palettes * add park palettes * fix error in playground monster spawning * update vehicles and monster groups and remove from the main file * tweak monster spawning

* Added new profession: Kitted Survivor Costs 1 point. Starts with worse clothing than the ordinary Survivor but has a full survival kit which can aid them. Inspired by Cataclysm++'s "Canned Survivor", who starts with a decked out "Survival In A Can" kit.

* replace std::weak_ptr with weak_ptr_fast, std::shared_ptr with shared_ptr_fast std::weak_ptr/std::shared_ptr forces atomic access despite the fact cdda is singlethreaded. * inline rl_dist(), trig_dist(), square_dist() * line.h: add rl_dist_fast, which allows to skip the sqrt so we can do the length checks in monster::rate_target() and compute the sqrt when we know it's necessary. * fix clang-tidy warning: remove redundant smartptr get()

* Remove legacy JSON from vehicleparts * Mod (except Blaze) vehicleparts JSON * Blaze Turrets * Blaze mod vehicleparts JSON * Fix typos * Restore solar panel copy-from * Added missing reqs clear

* Updated lang/extract_json_strings.py for accepting JSON objects without type field * Routine i18n updates on 29 Nov 2019

exactly what it says in the title

Enable autosave by default

bionics .json added, bionics lists moved from item_groups.json

Let autotravel happen on other z-levels

Load migration ID arrays properly

Dont consume charges when not required in plank chopping

moved multiple item spawn lists from general item_groups.json to locations.json.

Make sure the SDL activity receives native events for back button, even if DummyEdit is in focus

…ouldnt Stop NPCs being able to repair storage batteries

spawn list move - item_groups to locations

Updated Android SDL activity

…35780)

Add thievery warnings to witnesses to disassembling owned items

* scarhmag -> stanag30 Correct magazine inside gun. * Fix for using gasoline as flamethrower ammo

Prevent stalebot from stale-ing PRs in feature freeze.

…ns-2019-11-28 Cleanup point-related code

Fix typo in speedloader description

* Make monster carry weight 1/5th of body weight Previously, carry weight calculation for monsters was the same as for humans, using a 5 tier size system, where monsters were placed in tiers based on their weight. This caused a few problems: - Tier 5 too small in some cases (e.g. cows could only carry 52 kg) - Tier 1 too big in some cases (e.g. chickens carrying 3x body weight) - Tiers too granular; increase of a single kg could double carry weight * Use existing member variable instead of literal Co-Authored-By: anothersimulacrum <anothersimulacrum@gmail.com>

* Rescuer brings a magazine * Rescuer uses their harness

* Fix CI failures The install time for all other gunmods is commented out, it doesn't appear to work right now. One description was missing a space. Add an uncomfortable grip gunmod and have it installed by default on the remington 870 MCS, instead of the handling modifier which does not work. * Update blazemod for shotguns * Fix speedloaders Done at the request of tenmillimaster * Remove dead reference to l_def_12 in no rivtech * Fix shotgun tests

Holiday title screens

Substitute sunglasses for fitovers if near/far-sighted

Feels a bit irrational to have the rescuer going on a dangerous mission to rescue their friend from a mi-go camp with only one mag of ammo in their gun. Though, I suppose going there in the first place isn't the most rational thing to do...

Give rescuer 3 magazines

Removed useless revert_to fields from various items

Returned EE back

* Make batteries more standardized * Adjust Foodperson mask to last one shift 8 hours * 60 min / hour = 480 minutes, so a Foodperson works for 8 hours and 20 minutes with a medium battery and 1 second turns.

)

Fix region overlay in Magiclysm mod

* Remove professions with survivor armor, change Rescuer to fur armor * Remove obsoleted profs from scenario options * Obsolete collections, give rescuer utility vest for magazines

#35825) * Add JSON field to delete flags in recipes My initial incarnation of flag inheritance included an item flag that completely disabled flag inheritance when that item was crafted. In retrospect, that was a poor solution. It is too heavy-handed in practice. For instance, it doesn't allow recipes to inherit one flag as normal, while removing another. This solution should be more practical. * Remove obsolete NO_CRAFT_INHERIT flag The new "delete_flags" property of recipes does everything it used to do and more. Also replaced all uses of NO_CRAFT_INHERIT with delete_flags property. * Change flags_to_delete from vector to set As suggested by BevapDin.

* Rope and cordage overhaul * Add extra comments about weight/length

Removes parasites from raw_milk

Very small typo fix

Make FEMA evacuation pamphlet "looks_like": "newest_newspaper" instead "newspaper"

added Brioche where it makes sense as an ingredient

Tube magazine fixes

Resolve #35858

* Fix typo * Add experimental product flavor

* update bird.json name, weight, volume * update defense_bot.json name, volume, weight * update drone.json name, abstract * update fish.json name, weight, volume

* Fixed sidewalk generation for city buildings

* Add Difficulty to Dark Sight Was originally zero. Justifying the value chosen by the clairvoyance spell, which gives you instantaneous 1 turn vision on all tiles in the aoe based on level. Clairvoyance has difficulty 4. Whereas Dark Sight gives encumbrance-free light amp vision for the same amount of time as a magical light spell. Compared to the Magical Lamp spell which generates regular light at difficulty 2, for the same amount of time. Comparing the distance you gain in vision from light amp, difficulty 6 seems justified. * Add max level and 100 mana cost to Dark Sight Set it at 20, like every other spell. Made the mana cost equivalent to Magical Light.

Resolve #35814

Updated road connections to various wilderness locations

Remove stim values from cheeseburgers etc.

Factor in animal carry weight when determining yoke-and-harness power

Fix resource requirements when washing items with charges

Appease clang (2019-12-05)

* add sound/deafness to labels and labels-narrow sidebar layouts * attempt to appease clang-tidy

Add fragile flag to majority of glasses.

…nk-factors Jsonize skill companion rank factors

* Raise chance to get boxes in supplies_hardware. * Raise change for medium_box in mischw group. * Raise chances to get boxes.

[Aftershock] Modify flatbread recipe

Routine i18n updates on 6 Dec 2019

* JSONize flag taste modifiers There was only a single flag that affected the "fun" value of comestibles (BAD_TASTE) but I want to add more for a water sanitation rework, so rather than hardcoding more, I JSONized the process. Adds a new member variable to json_flag objects, "taste_mod," which additively modifies the enjoyability of comestibles. This is done via a new function, "item::get_comestible_fun". The MUSHY flag check was moved there from Character::fun_for as well. "item::get_comestible_fun" is of course called in "Character::fun_for", so this commit shouldn't have any functional changes. * Make "islot_comestible::fun" private Anyone trying to query a comestible's "fun" should be using the new "item::get_comestible_fun" method. This commit is to enforce that. Of course, that had to be reconciled with the current usage of "fun". I added "item" and "Item_factory" as friends of "islot_comestible" so that "item::get_comestible_fun" and the function that sets "fun" still have access to it. All other queries of "fun" were instead changed to the new method. This has the side-effect of applying BAD_TASTE and MUSHY effects in places where they didn't before, including but not limited to: - Interaction with taste blocker bionic. - NPCs making decisions about faction food stocks. - NPCs making decisions about whether they personally want food. - Scavenging monsters deciding whether to eat food off the ground. * Apply suggestions from code review Co-Authored-By: BevapDin <tho_ki@gmx.de> * Subjugate rogue tab (i.e. astyle) * Fix merge mistake

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Catchup to Master #7

Catchup to Master #7

Commits on Oct 22, 2019

Commits on Nov 15, 2019

Commits on Nov 19, 2019

Commits on Nov 21, 2019

Commits on Nov 23, 2019

Commits on Nov 24, 2019

Commits on Nov 25, 2019

Commits on Nov 26, 2019

Commits on Nov 27, 2019

Commits on Nov 28, 2019

Commits on Nov 29, 2019

Commits on Nov 30, 2019

Commits on Dec 1, 2019

Commits on Dec 2, 2019

Commits on Dec 3, 2019

Commits on Dec 4, 2019

Commits on Dec 5, 2019

Commits on Dec 6, 2019