Test PR #41
Merged
Test PR #41
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
Co-authored-by: irwiss <[email protected]>
Add more generic_factory checks to vpart_info loader
* Documentation + Configuration * Update .vscode/settings.json Co-authored-by: Alexey <[email protected]> * Doing Irwiss thing instead Co-Authored-By: Alexey <[email protected]> --------- Co-authored-by: Alexey <[email protected]>
* Routine tileset updates on 25 June 2023 * Update gfx/ASCII_Overmap/tile_config.json * Update gfx/ASCII_Overmap/tile_config.json --------- Co-authored-by: casswedson <[email protected]> Co-authored-by: Maleclypse <[email protected]>
* 3d cached * remove safeguards * limit cache to view range additional safeguards prevent segmentation fault when switching from legacy to 3d draw mode * comment and astyle * clang tidy * fix tests
This was causing a frankly hilarious bug that would cause Name::get to return "Tom" no matter what search flags were passed whenever localization was disabled. This meant that EVERYTHING was Tom. Have you been to Tom Town yet? No? That's because it's also called Tom Tom. Can't remember that person's name? It's Tom. Their last name? Also Tom. Committing some identity theft but stuck on "Mother's maiden name"? I'll give you a hint: it's Tom. This commit should fix this disastrous issue by making sure set_language, which is what loads the names file initially, gets called even when localization is disabled.
* Create polymer_plant * Merge branch 'master' of https://github.com/Paprika-H/Cataclysm-DDA * Update character_attire.cpp * Update mutations.json * Update character_attire.cpp * faux fur gloves * faux fur feet styuff * faux fur scarfs * faux fur boots recipes * Update hands.json * Update feet.json * Update hands.json * Update character_attire.cpp * Update flag.h * Update flag.cpp * Update consumption.cpp * Update flags.json * Update dairy.json * Update consumption.cpp * Update flag.cpp * Update consumption.cpp * Update flags.json * Update boots.json * Update gloves.json * Update suits_protection.json * Update suit.json * Update flag.h * Update flag.cpp * Update flags.json * Update dairy.json * Update character_attire.cpp * Update consumption.cpp * Update suits_protection.json * Update scarfs.json * Update legs_armor.json * Update legs_armor.json * Update legs.json * Update legs_armor.json * Update holster.json * Update storage.json * Update holster.json * Update holster.json * Update holster.json * Update scarfs.json * Update scarfs.json * Update legs.json * Update nested.json * Update suits_protection.json * Update wheat.json * Update legs.json * Update legs.json * Update mutations.json * Delete polymer_plant * Update boots.json * Update gloves.json * Update holster.json * Update scarfs.json * Update feet.json * Update hands.json * Update legs.json * Update storage.json * lint * Update scarfs.json * Update feet.json * Update mutations.json * Update holster.json * Update holster.json * Update consumption.cpp * Update flag.cpp * Update character_attire.cpp * Update holster.json * Update storage.json * Update nested.json * Update consumption.cpp * Update character_attire.cpp * Update consumption.cpp * .22 ar * Update magazines.json * Update magazines.json * Update magazines.json * Update magazines.json * Update mechanism.json * Update 22.json * .22 ar * Update gunmod.json * lint * Update gunmod.json * Update magazines.json * Update 22.json * Update mechanism.json * Update data/json/mutations/mutations.json Co-authored-by: NetSysFire <[email protected]> * Update character_attire.cpp * Update holster.json * Update item_factory.cpp * Update holster.json * Update nested.json * Update storage.json * Update nested.json * Update holster.json * Update holster.json * Update gear.json * Update gunstore.json * Update military.json * Update clothing.json * Update locations.json * Update item_factory.cpp * Update item_factory.cpp * Update holster.json * Update storage.json * Update sheath.json * Update storage.json * Update holster.json * Update storage.json * Update storage.json * Update storage.json * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update nested.json * Update holster.json * Update boots.json * Update legs_armor.json * Update consumption.cpp * Update consumption.cpp * Update character_attire.cpp * Update sheath.json * Update suits_protection.json * Update legs.json * Update holster.json * Update holster.json * Apply suggestions from code review Co-authored-by: David Seguin <[email protected]> * Update src/consumption.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: Ferride <[email protected]> Co-authored-by: NetSysFire <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: David Seguin <[email protected]>
Readd Glorious to Elf-A
* cast the iron * big ingot * Update metal.json * magiclysm evils
* Enable mod_tracker for vpart_info * Remove LOCKABLE_DOOR from cloth doors
…ithout harnessed animals. Vehicle remote controller now correctly works for single action work (used to throw a null pointer since it could not locate a vehicle)
# Conflicts: # src/vehicle_use.cpp
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…ency-docs Updated generator docs
Bypass variant picking on install if there's only one choice
* Update EFFECT_ON_CONDITION.md * Update EFFECT_ON_CONDITION.md
* Add WIP soda lime cartridges * Adjust ammunition types, prepare ammunition type for O2 regen powder * Soda lime cartridges * Now cartridges accept charges according to weight * Add soda lyme granules and potassium superoxide powder as ammunition * Weight adjustment * Make rebreathers use soda lime cartridges by default, balance tweaks, restoration of xs divemask * Fix * Oxygen regenerator cartridge * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Timing adjustments * Update ammo.json * Update ammo.json * Update dictionary.txt * Update ammo.json * Update ammo.json * Masks should be able to use KO2 as ammo too * Update generic_guns_validator.py * Update professions.json * Update classes.json * Update activities_hobbies.json * Update locations.json * Update hazmat_gear.json * Update gear.json * Update clothing.json * Update filter.json * Cartridge recipes * Update data/json/recipes/armor/other.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/armor/other.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/armor/other.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Add potassium * Potassium recipe * Chemistry stuff * Update other.json * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update known_bad_density.json * Update tool_armor.json * Update tool_armor.json * Update tool_armor.json * Update head.json * Update head.json * Update tool_armor.json * Update migration_items.json * Axe the old filters * Update data/json/obsoletion/migration_items.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update other.json * Update recipe_medsandchemicals.json * Update other.json * Update supplies.json * Update flags.json * Update hazmat_gear.json * Update ammo.json * Make mags watertight. * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Dillon Matchett <[email protected]>
Remote vehicle controller and programmable autopilot fixes
change dark wyrm's blood type to foul acidic blood
gold rings are rigid conflicts layer only
* nerf the nanotubes * clarify description
* Implement Jmath * Remove RANDOM_AOE
* Tamable_Wildlife Mod, Tamable Slugs Allows taming of the other mollusks, slugs. For Tamable_Wildlife * Update mollusk.json * Update mollusk.json * Update mollusk.json * Update data/mods/Tamable_Wildlife/mollusk.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Update character.cpp * Update lightmap.cpp * Update mutations.json * Update character.cpp * Update character.h * Update lightmap.cpp * Update src/character.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/character.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Rebalanced generic zombie drops and bugout bags * Update data/json/monsterdrops/zombie_default.json I obey the bot Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Farming expansion * Update .gitignore * Update generic.json * Update data/json/items/comestibles/other.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/comestibles/junkfood.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/comestibles/other.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/comestibles/other.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/comestibles/other.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/corn.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/corn.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/corn.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/corn.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/corn.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/corn.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/corn.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/corn.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/corn.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/corn.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/corn.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/corn.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/corn.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/corn.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/corn.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update dictionary.txt * Update data/json/recipes/food/corn.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/corn.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/corn.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/dairy_products.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/food/dry.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/iexamine.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/iexamine.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/iexamine.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/mapdata.h Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/iexamine.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Don't turn off portal storms * Minor fixes * Update data/json/items/generic.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/generic.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/generic.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * spellign * Update wheat.json * Various fixes * Linting * fodder fixin' * Canola fodder and lentil fixes * Update src/iexamine.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Fix inedible * Update faction camps and tacoma for seed consistency * Finishing touches * Update src/activity_item_handling.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/activity_item_handling.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/activity_item_handling.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/activity_item_handling.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/faction_camp.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/faction_camp.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/iexamine.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/iexamine.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/mission_companion.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/activity_item_handling.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * resolve conflict * Resolving conflicts * Update flags.json * Update src/iexamine.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/activity_item_handling.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/activity_item_handling.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/consumption.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update construction.json * Update construction.json * Update flags.json * Update data/json/construction.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update dictionary.txt * it's double space thursday * Update other.json * Update raw_fruit.json * Update raw_veggy.json * Update fruit.json * Update data/json/uncraft/comestibles/fruit.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update seed.json * Update seed.json * Update veggy_dishes.json * Update seed.json * Update seed.json * Update seed.json * Update other.json * Update other.json * Update seed.json * Update other.json * Update raw_fruit.json * Organize jsons * minor bugfix * consistent names * obey the tests * Update src/consumption.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * change canola stalk description (no flowers) * Update raw_grain.json * Update seed.json * Update iexamine.cpp * Update raw_grain.json * harvest_seeds was redundant apparently seeds: false exists and works it just hadn't been used in nine years * Organizing grain jsons * Update raw_grain.json * Update data/json/items/comestibles/other.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/comestibles/other.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update seed.json * Update seed.json * Update seed.json * Update seed.json * Update raw_grain.json * Update seed.json * Update iexamine.cpp * minor cleanup * extra spaces * Update seed.json * cut eggplant item * Update seed.json * eggplant uncraft * Update .gitignore --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* add caco3 * caco3 synthesis recipes * caco3 spawns * caco3 spawns * antacid tablets recipe * adjust it * Update data/json/recipes/recipe_medsandchemicals.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * adjust * Update recipe_medsandchemicals.json * Update chemicals.json * Update data/json/recipes/recipe_medsandchemicals.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/chem/chemicals.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update chemicals.json * correct salt byproduct --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…leverRaven#66724) * arithmetic->math * Fix deactivate condition * Separate values per storm distance * Change exact probability slightly
* reduce impact of bmi on healthiness * fixes * Update src/character.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * force normal kcal values * move it to the right place * test sanity checks * Update char_healing_test.cpp * Update char_healing_test.cpp * make sure OoO isn't screwing up * add another healthy_kcal setter? * keep forcing healthy kcal * test * this wasn't it * set healthy kcal again? --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Quick JSON fixes
* Innawoods maintenance * Make lye recipe autolearned in innawoods
* Code * Perk
…damage to tile (CleverRaven#66735) * incorporated strength and melee damage enchantment into smash * removed strength enchantment calculation and added calculation for any ITEM_DAMAGE_BASH * fixed style * refactored so that MELEE_DAMAGE enchantment will always be factored in, not just when player is wielding weapon * forgot a semicolon lol
* Update claw bar volume to be consistent with crowbar * Adjust claw bar volume to be proportional to weight of crowbar. * fix expected dps * Revert "fix expected dps" This reverts commit 6a1edfa. Revert test change * Reduce damage to match test
* Grab cleanup * Didn't save my JSON changes woops * actually clear effects on 1 mon * Saving and clang
* tiles * curses * prevent shadow sprite fallback * optimization and formatting also remove some rogue code comments from my previous PRs * prevent drawing overlay twice * blinking indicators for curses * update docs and py * check sees for overlay * merge fixes Co-Authored-By: Jianxiang Wang (王健翔) <[email protected]> * add NOLINT --------- Co-authored-by: Jianxiang Wang (王健翔) <[email protected]>
* jsonify monster flags: code and flag conversion * jsonify monster flags: docs and lang parser * jsonify monster flags: optimizations * jsonify monster flags: remove expensive debug stats tracker for mflags
* Add and distribute Zener cards * item -> group
…bugfix [MoM] Fix coruscating matrix crystal not draining on use
…ity on start (CleverRaven#66781) * Most scenarios provide vision of nearest city on start * Don't forget to document your json levers! * Oops, no need for test messages * Please clang tidy * Blacklist a bunch of scenarios that should not reveal anywhere on start
* bap * Update data/json/npcs/EOC_talkers/portal_storm.json Co-authored-by: Maleclypse <[email protected]> --------- Co-authored-by: Maleclypse <[email protected]>
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
Category "Brief description"
Purpose of change
Describe the solution
Describe alternatives you've considered
Testing
Additional context