Catchup to current mainline #4

…pawn

Obsolete previously removed recipes and items (2019-10-08)

…teries-in-lab-finale Replaced free-floating battery charge spawn in lab finales with heavy battery cell spawn

…om-mapgen-to-itemgroups Removed musicstore itemgroup

…lete-json Moved bluebell flower to obsolete

SUMMARY: Bugfixes "Fixes active phones not showing time" Purpose of change Fixes #34563, smartphones as well as cellphones now allow you to see the current time when playing music or using the flashlight app Describe the solution Added "WATCH" flags to all states of cell_phone/smart_phone

To inform new contributors of the existance of the style guide expands on #34497

merge from master

* Move engines.json to uncraft folder * Moved from recepes/engine.json and also removed the engine_disassembly entry

* Moved flowers and buds from items generic to obsolete * Moved flowers and buds from items generic to obsolete

* Added wine_glass to dinnerware itemgroup * Added wine_glass to dishes_dining itemgroup

Add steel armor plate recipe

Add run and crouch colors for the player's @ symbol

Mention JSON style guide in lint failure message

* change scope of armor functions * move character functions to proper place * remove auto

Updates Martial Artist and Black Belt profession martial arts lists

Fix phones not showing time when being used

Fix cross-compiling for OSX

…dth-increase Increased wish item menu's left column width to 50

Add batch time savings to powdered milk to bring it in line with other food preservation recipes

Fixes #31872 Add the option to recall any NPC that has been on a mission for more than 24 hours. This cancels the mission without refunding any resources, but can be used to recover NPCs that are otherwise stuck.

* Populate coords for activity ACT_PICKUP with player position at the start of the activity, then bail out of the activity if player pos is different at the start of activity_on_turn_pickup() * Add message to notify player pickup activity has been cancelled.

…19-10-09 More guards for OSX cross-compile

Prevent this is a bug display while player is sleeping.

Fixes #32024 Pyromaniac morale penalty does not accumulate

Fix invalid activity_type: ACT_NULL debug message

* Several tweaks for Character Creation UI * Increased maximum available space for starting location * Trim long trait name

…-tools_science-itemgroup Add filter mask cartridge to tools science itemgroup

* Refactored the handling of broken/disabled limbs. Slight change to prevent using muscle engines with your arms when arms are disabled as opposed to broken.

…#34598)

* fix firetower bug * fix infinite reging-fire supply to below

Fix clang-tidy errors and astyle regression

1. Reads all tile entries 2. generates unique png names for each index that is in use 3. replaces all indices with the unique names 4. writes all the tile entries out to folders by png size 5. uses ImageMagick to pull all the image tiles for each tile entry, using the unique names instead of the indices. A later commit will add a compositor script that will reverse this process to create a set of tilesheets from a collection of arbitrarily named files.

Add a script that generates tilesheet pngs and a tile_config.json from the pngs_ directories in a specified tileset directory. 1. walk through the directories, reading the tile_entry.json files and creating lists of the png files. 2. by rows of 16 images, merge all the images with the same dimensions into a tilesheet while creating dictionaries of image names to tilesheet indices. 3. go through the tile_entries and change the bg and fg image names to the tilesheet indices. 4. write the resulting tile_config.json TODO: write the config file as tile_config.json instead of test_tile_config.json

Add some minimal tileset documentation. Add some information on how tilesheets are indexed. Describe how tools/gfx_tools/decompose.py and tools/gfx_tools/compose.py work. Include some recommendations for setting up composite tilesets.

tilesets: add tools to automatically create tilesheets

As suggested by, mlangsdorf on the Discord add a testing category

* Update enchanted_wands.json * Update enchanted_wands.json

…le-itemgroup Add pepto to drugs_heal_simple itemgroup

fix adding preset keybind to sokuban reset.

…to-itemgroups Add pair of beaded earrings to 5 itemgroups

Fixed picking up liquid containers from keg (or bathtub, etc.)

Add `active` to `use_action` with lit target items

Fixes Enjoyability is not shown for some food

Martial Arts Rebalance for Snake Kung Fu

…`checkPrerequisite`).

Actually spawn PF pawn shop

Minor updates to tileset composer script

Fixed options manager to handle global/world options correctly

* assign NPCs to camp and give them jobs * remove jobs that arent implemented yet * change access map to avoid inserting new key * remove crafting from job map - not merged yet * change descriptions of jobs * Update src/faction_camp.cpp Co-Authored-By: Jianxiang Wang (王健翔) <[email protected]> * astyle

…ed result

* Apply ITEM_SPAWNRATE to monster drops Previously, setting a low 'item spawn scaling factor' did not affect drops from monsters, making a disproportionate amount of a player's loot come from monster drops. This changes that so that monster drops are reduced as well. fixes #28919

fix "using" field not working in array form for construction recipes

Correctly mark two translator comments

* hide blacksmith survey * really fix it this time

…-poor-fit Crafting from poor-fitted components no longer produce perfect-fitted result

'flying projectiles' when they hit an item or stack of items. Prior to this change, lasers, bolts of plasma, and bolts of electricity would be referred to as 'flying projectiles' when damaged items on the ground, which was strange and factually incorrect. Lasers are not flying projectiles, nor are directed lightning bolts. Plasma is up for debate. This change adds conditional statements to map::shoot() which change the message that is passed to map::smash_items() when items are shot. The message is changed based on ammo flags.

* magical rings * Update data/mods/Magiclysm/enchanted/enchanted_rings.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/enchanted/enchanted_rings.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/enchanted/enchanted_rings.json Co-Authored-By: Curtis Merrill <[email protected]> * Update data/mods/Magiclysm/enchanted/enchanted_rings.json Co-Authored-By: Curtis Merrill <[email protected]> * spell adjustment

very not healthy for a body.

Also added antibiotics to hospital_lab itemgroup.

change antibiotics to reflect their mid-tier status.

argh

Prevent an integer overflow that can occur if the new power added in Character::mod_power is greater than the max power level. This would cause power to be clamped to 0, because the integer overflow would make the power to be added massively negative, when it should be positive. Also prevent an integer overflow that occurs when units::from_joule and units::from_kilojoule are given a value that, when converted to millijoules, is larger than it's type can store. This was another cause of problems in bionic power, because the new power could overflow, and then not be the correct value. This occurred in testing when trying to use the battery charger system with a heavy disposable battery.

in the absence of alternatives... little clarification in the description bumped up the price point.

…34674)

* change scope of hurt and heal * move Character functions to character.cpp

* Add item smart lamp to itemgroups * Put a comma instead of period

Add missing tags to smartphone_music and smart_phone_flashlight

Fix for infinite counterattacks at low speed

Apple orchard spawn fix

Fixed filament vs. cordage/short cordage requirement in recipes

Updated No Acid Zombies mod to include two acid zombie soldiers

Check if firestarter can have charges before trying to consume it

…0 liter tanks to be more realistic. Prior to this change, these tanks required a welder to install, and were uninstalled with metal sawing. This seems sensible at first, until you realize that the 10L tank is made of plastic, and that even metal tanks are not installed via welding on modern vehicles. Additionally, 10L tanks required a welder to repair, despite being made of plastic. This change changes the requirements to install the tanks to be bolt turning (1 for 2/10L, 2 for 20/60L), and drilling 2. This better represents the process of bolting the tank to the frame using metal strips or brackets, which is how fuel tanks are installed in modern vehicles. Tanks are uninstalled using only bolt turning of a level equal to the level required to install them, and the 10L tank now requires a soldering iron to repair it.

I kept forgetting how to spell it.

per discussion.

Currently guns are spawned with a range of between 100 and 9999 dirt. The vast majority of guns won't be that heavily used since they were last cleaned.

Add v6_diesel item to appropriate itemgroups to fix #34675

Stop lasers, plasma, and bolts of electricity from being referred to as 'flying projectiles'

* Adds disposable batteries to mp3 Allows for disposable batteries to be used in the mp3. I assume it was an oversight.

Lower the range of dirt guns are spawned with

* add house foundation, palette * nested maps * adjust bathroom loot

Change the requirements for installing and repairing 2, 10, 20, and 60 liter tanks.

* compose.py: check whether hasalpha() is a valid function My development version of pyvips doesn't have hasalpha(), so test for it's existence and fail gracefully if it doesn't exist. * compose.py: add filler directory support Add support for filler directories. Sprites and tile_entry.json metadata for an id in a filler directory will be ignored if the same id is defined in a non-filler directory.

Prevent integer overflows in bionic power

Make quarterstaff require long stick; remove bash requirement

* added jackolantern and recipes includes transformation when candle is lit * Change ammo type to batteries changes flags to make sense with batteries. removes need fire

Martial Arts Rebalance for Sōjutsu

Fix two translator comments in name.cpp

* Json items Test items * Dimensional Anchor Effects * New lab finale for items and Misc decoration * Style Code * Remove test monster Whoops that wasnt supposed to be there. * Apply suggestions from code review Co-Authored-By: Anton Burmistrov <[email protected]> Co-Authored-By: Curtis Merrill <[email protected]> * Fis misc. errors and typos. * Replace odds for lab finale

Added turrets and other monsters to missile silo mapgen

* JSONize scent neutralization

* Added Wayfarer negative trait Renders the player incapable of driving vehicles

Fix some random new typos

Fix some typos

Fixes #34614 NPC trading was broken because drop_items() would sometimes randomly crash on some kind of item.is_null() error in npc::drop_items(). Replace drop_items() with character::drop_invalid_inventory() which does roughly the same thing but works. Also, switch the sign of changes to NPC available weight and volume when trading, so that selling items to them reduces the amount of space for further items in this trade, while buying items from them increases the amount of space.

* Introduces a few misc magic items and magical tokens * Update data/mods/Magiclysm/enchanted/enchanted_tokens.json Co-Authored-By: Curtis Merrill <[email protected]> * Update enchanted_misc.json * Update data/mods/Magiclysm/enchanted/enchanted_tokens.json Co-Authored-By: Curtis Merrill <[email protected]> * update * Update enchanted_misc.json

* Unify text spacing after punctuations * Fix translator comment position * Remove spaces after ellipses that start a sentence * Remove spaces before punctuations and end of lines

…anofabricator add-superalloy-dog-suit-to-nanofabricator

Add monster plural names

Fix vanishing pet carriers on release

…dations add 4 more nested house foundations

* Move items into fire to handle splitting charges * Fix burning charged items

Fix some more typos and delete some extra spaces

Add strong antibiotic: destragon.

translocation ignores fall damage

* change scpoe of spores() and blossoms() to Character * move spores() and blossoms() to character.cpp

* add some domestic furniture and terrain

…house_1- add roof, landscaping, cosmetic changes to house_w_1

move scope of player::position plus getters and setters to Character::

npctrade: fix crash when trading with Free Merchant merchant

* Single space after semicolon * Fix comment * Update test * Disable ellipsis space check in the middle of lines * Remove spaces after ellipses that start a line * Remove spaces before punctuations * Ignore ter_bind and furn_bind strings

* More helpful denials * mounted autoclave also gives info

Fix furniture door pathfinding

…eal life

The purpose of change section has triple backticks around the "Fixes #XXXXX" in the comments. This causes misformatting of PRs.

Condense melee weapons into one file

Martial Arts Rebalance for Taekwondo

Looks like for obsolete centipede

…34769) * Transformable items with ACT_IN_FIRE and BOMB flags will transform into their "_act" variants and then become active if thrown in fire * Get rid of hardcoded name and use target item id

…lapping-stamina-indicator Fixed speed indicator overlapping stamina indicator

…eed (#34770) * Running movement mode while swimming means faster swim speed * Swimming speed is now based on movement mode

Fixes check for broken limbs when using muscle engines

add tele_sight to itemgroups

Changed celery volume to better reflect the mass-to-volume ratio in real life

…t-to-itemgroups Revert "add tele_sight to itemgroups"

* Fix astyle regression * Simplify boolean expression

Fixed "Error with crushing a hostile NPC with a car"

* Revert "July and August changelogs (#34095)" This reverts commit 7a20bb6. * Have changelog generation script consider unmerged PRs too * Import changelog entries through 10-09 * Copyedit changelog * Apply suggestions from code review Add some periods. Co-Authored-By: ZhilkinSerg <[email protected]>

…-gen Switched the Stats and Traits tab in the character creation screen

The helper function get_item_location() did not support items being in vehicles. This commit corrects that oversight.

* Prevent counterattacks if tired or dead * Changed threshold to 25% * Changed threshold back to 33%

BUG: Fix redundancy error in cattail-jelly recipe

Fix immersion suit Iuse

Updated type section of technique description

…clothing.json move clothes item_groups

Fix repair activity for tools in vehicles

Remove unneeded code from read_do_turn

…-house_w_2 add roof, landscaping to house_w_2

Installable, not dirty, bionics in inventory are always green

* finish reorganizing furniture.json * remove duplicats, add coat rack

…ter to Character (#34761) * change scope of crossed_threshold() * moved crossed_threshold to character.cpp * change parameter of test_crossing_threshold to Character * change "p" to "guy"

* Migrate move mode and related code from player - Hoist the move_mode variable up to character since NPCs should crouch and run someday - Drop UI-related code down to avatar - Serialize/deserialize move_mode in the character functions - Tweak related code to accomadate the changes * Migrate get_overlay_ids() to Character This fixes compilation of SDL builds

Tweaked NPC "Trade how many" menu

…rol unit (#34202) * Added turret control unit * Made it craftable (autolearn) * Added corresponding vehicle part * Added flag to bitflags set * Added documentation * Forcibly set turrets' targeting mode to manual if no turret control unit is present on turret's tile on loading save * Allow changing turrets' targeting mode only if turret control unit is present Also reworded targeting mode options a bit to reduce confusing. Also removed a check for MANUAL flag as there is no items or vehicle parts with this flag. Also reworded reason of why you can't aim automatic turrets and added a missing period. * Turret controls must be installed on a turret Also, on removing turret controls forcibly set targeting mode of affected turret to manual. * Set turret control unit's state equal to turret's targeting mode * Increased control unit power draw * Added a requirement for laptop computer Also inreased craft time to 2 hours. * Added mechanics skill req for crafting TCU Also increased its power consumption from 100W to 250W.

Fixed targeting UI issue for reach attack.

Removes capacity from cable and battery CBM

Mythological Replicas work with martial arts

Fix: Dialogs not showing while tailoring.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Catchup to current mainline #4

Catchup to current mainline #4

Commits on Oct 8, 2019

Commits on Oct 9, 2019

Commits on Oct 10, 2019

Commits on Oct 11, 2019

Commits on Oct 12, 2019

Commits on Oct 13, 2019

Commits on Oct 14, 2019

Commits on Oct 15, 2019

Commits on Oct 16, 2019