Merge pull request CleverRaven#37638 from Night-Pryanik/st-john-farm-… #71
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
To increase realism and game consistency regarding partial deafness Partially fixes #36013 Disallows an attempt at safecracking while player has `effect_earphones`. Due to a loophole caused by mp3 player activation being instantaneous, it is still possible to begin safecracking immediately after putting on the mp3 player (but not after 1 turn has passed with the mp3 active).
With the logic to prevent safecracking with `effect_earphones`, there was an edge case immediately after activating them mp3 player, still allowing a safecrack attempt to be made. Fixes #36013 Turning an mp3 player on or off now takes 1 second, where before it took 0 time. This allows `effect_earphones` to become active before the next action, preventing a safecracking attempt. Unfortunately, it leaves a second edge case when the mp3 player turns off (which also takes only 1 second); there, for some reason I can't determine, the `effect_earphones` status remains alive for a further second. As a side note, this 1-turn delay on activation, and 2-turn delay on deactivation has been clearly visible in-game in the experimental branch for quite some time, using the DeadPeople tileset. You may have noticed after turning on an mp3 player that it takes 1 further second for the icon to appear above your avatar, and that after turning it off, 2 seconds must elapse before the icon disappears. Now, because of the 1-second (de-)activation time, turning it on gives the icon right away, but turning it off still takes 1 more second.
By making the mp3 player take 2 seconds to turn off, the avatar status indicator is correctly updated, and earphone effect is correctly refreshed, allowing a safecrack attempt immediately after turning off the mp3 player. Increasing the mp3 turn-on time to 2 seconds for symmetry.
Prevent the truncation of proportional damage values by using floats for the display functions. The numbers here are small enough that the precision of floats should never be a problem.
Some objects in the JSON files are defined multiple times (that is: there are several object with the same "type" and "id" member).
Most of those duplicates are identical.
Some are slightly different.
The game will usually overwrite the previously loaded data with new the date from the new definition, so when the duplicates are different, this uses the value from the later definition.
----
How do we even get those duplicates?
Could it be because the location of those definitions is not easily predictable ("grave" is defined in "terrain-manufactured.json" and in "terrain-floors_outdoor.json")?
But some of those duplciate appear *right* next to each other (e.g. in "overmap_terrain_recreational.json").
…ion defined. There is no item of that id anymore. Existing items will be converted to "can_bomb" as defined in the migration entry.
Routine i18n updates on 31 Jan 2020
Moved diving code before the check for terrain's "climbality"
…er_descriptions"
Deduplicate some JSON data:
Remove vending item groups from nonsensical places
DOC: renamed an instrument description field from "descriptions" to "player_descriptions"
Melee.json sorting
Fix bug in wield UI
Prevent safecracking attempt while wearing earbuds
Set sap temperature when producing it
* Renamed monstergroups_egg.json to eggs.json * Sorted out the rest of monstergoups.json
* Ranged.json sorting * Sorted out archery.json and crossbows.json
* Monsters.json sorting * Update fish.json * Moved searchlight to turrets.json
Glock 17 default magazine bugfix
Add missing bionic doc
Fix faction camp blueprint recipe autocalculation consistency
Obsolete location mods
The "goal" section was all running together in github's markdown viewer; changing this to table formatting makes it consistent with other tables in this doc. Also replaced tabs with spaces in JSON example and trimmed trailing whitespace.
Clean up doc formatting
* item_groups.json sort 7 created 1 new .json (electronics); renamed monster_drops to monster_drops_lairs to reflect the file now containing lair item lists; moved various other item lists.
Replaced unused overmap terrains with "null" om_terrain for TWD dairy farm
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