Merge pull request CleverRaven#37829 from BevapDin/bor #76
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The algorithm for nearby table location is done in at least 3 places: - src/activity_handlers.cpp:L412-419 - src/activity_item_handling.cpp:L1428-1435 - src/consumption.cpp:L845-850 Moving `has_nearby_table` as a new function it into map.cpp made it obvious that this is where it actually belongs; there it can fit neatly alongside its brethren like `has_nearby_fire`. This commit only adds the new function; refactoring will come next.
Factoring out the similar loops to check for nearby tables, and using the new `map::has_nearby_table` function instead.
tool Name to object, leave the s
Comestible modern json
* Name to object * Name to object * Name to object
Ammo modern json
Factor out map::has_nearby_table for eating/butchering checks
Add debug menu item for spawning nested mapgen
Bugfix house_wooded stairs to nowhere
Prevent broken legs dropping weapon
Items that are spawned using item groups aren't an issue since the contents of the groups get migrated on load. Direct spawning of items bypasses this migration. This commit applies migration to json mapgen definitions of direct item spawns and causes the migrated item to be spawned if need be.
With the current behavior and the AUTOSELECT_SINGLE_VALID_TARGET option disabled, there is inconsistency in the behavior of pressing c to close or e to examine. This can cause unintended actions if attempted on an invalid target. For example, if standing next to an already closed door and one quickly presses `c`lose and then the direction of the door, the first keypress will have no effect as the closed door is not a valid target. The second keypress will then open the door, which is the opposite of the intent. This commit removes the failure message and subsequent abortion of the action in the case that there is no valid target as to improve consistency.
Routine i18n updates on 7 Feb 2020
Remove DROPS_AMMO from firefighter bot
Migrate direct item spawns
Fix typo in item id of bio lockpick pseudo item
Body part names refactor
Always prompt for direction if autoselect disabled
…ow-skill-increase-indicator Skimming through book's contents won't show skill progress indicator
[Aftershock] Remove Circus Strongman
* Less precise item info volume to three decimals. Everything else to what makes sense * Remove build script Delete my bat for compiling * restore round_up Restore rounding up and set to thousandths place, for extremely low volume items.
Added "brush" to the recipe alongside rags or sponges. I changed the description to be more generic and accurate.
…ace-handling Update tileset compose colorspace handling
Added scrub brush to washing kit recipe
Fix NPC equip fail message
change aim level move time to int
Looks_like application for fields like fire and blood.
Fix reference to non-existing item group
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Purpose of change
Describe the solution
Describe alternatives you've considered
Testing
Additional context