Merge pull request CleverRaven#40048 from BrettDong/i18n #160
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
* Blazemod secondary content refactor Changes all blob/diamond/vortex ID conventions to be modernised completely across the board and fixes associated issues with previous refactoring of this content. Prelude to separation of this content from the main mod, now that it's modern enough to load without error.
In game::place_player(), add a check for the player being in a vehicle that can float before calling drench().
It makes more sense to use an unordered_set for these objects, and it has the added advantage that it avoids a string comparison.
The intention is to detect cases where a simple string comparison is being performed, but a localized comparison would be more appropriate.
Probably doesn't matter too much but changing the drop entry from `"count": [ 0, 1 ]` to `"prob": 50` seems to make more sense until I can audit and calculate what salvage should and would actually drop.
Removes archaic overrides that are no longer necessary from blazemod.
* Adjust some potion names * Change mana potion names to json object variety name Korg's request
The functions that end with “Ptr” either return the desired pointer quickly, in constant time, or they return NULL. If the latter is the case, you should use CFStringGetCString. https://developer.apple.com/library/archive/documentation/CoreFoundation/Conceptual/CFStrings/Articles/AccessingContents.html
Co-authored-by: John Bytheway <jbytheway@gmail.com>
Blazemod Mini-PR: Change salvage from turrets in blazemod from count to prob
Blazemod Mini-PR: Delete blaze_override.json
Fix clang-tidy header guard check on Windows
game: don't drench the player if the player is in a boat
Fix a crash when npc tries to heal horse-mounted player
Re-do volumes on Remington+Mossberg shotguns
…SXSystemLang make System language option work on macOS (fix getOSXSystemLang)
…or wielded item (#33271)
Declutter overmap terrain definitions (2020-04-30)
Enforce localized sorting
They will now be just slightly less efficient than 3 panels, be made using 3 of the corresponding type, and are single-tile-single-part vehicles that require a jumper cable or similar to draw power from. They can be folded, meaning you can deploy them near a stationary vehicle to help provide slightly more efficient power. They cannot be installed onto an existing vehicle, nor expanded from the base part. Recipes adjusted to make them more sensible.
Reduced price of all lighters to a more reasonable value
Blazemod Mini-PR: Completely remodel blazemod solar arrays
Routine i18n updates on 1 May 2020
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