Update latest codes #6
Merged
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
Adds the pistols, ditches the USP45's suppressor.
Updated Mk 23 size, added items
which is essentially a USP 45
Co-Authored-By: Alexey Mostovoy <[email protected]>
Co-Authored-By: Alexey Mostovoy <[email protected]>
`plural_name` - > `name_plural`
Martial Arts Rebalance for Judo
…ve_vehicle. So the caller does not have to do it. At least one caller (from `monster::shove_vehicle`) did not do this.
Add two separate checks for 1) empty displacement vector and 2) for displacement vector being too large. Changed third check into an assertion as it is ensured by the splitting code above.
* Make repair_actions non-static. Put them into `Item_factory` and clear and reset them on each game resetting. * Also clear Item_factory::misc_tools
* add unique book reward herbal remedy book, survival skill. * add mission and slight map adjustements for trade.
* Changed Sweet Tooth to be a starting trait * Added Sweet Tooth starting trait to NPCs Removed ANTIJUNK from possible starting traits, created a new trait group with both PROJUNK and ANTIJUNK and added that group to possible starting traits. Possibility 5 because of allergy.
* Add a survival kit * add to item groups * change description to not be written by Mario * fix another spelling error * give survivor zombie a small chance of dropping a survivor kit * give survivor zombie a small chance of dropping a survival kit * implemented suggestions by @Maddremor * remove irrelevant flag * handflares instead of flare gun * add Pocket Survival Guide to kit
Disable Marloss Voice Random Spawning
…he Empre Strikes Back (#33551) * update * fix acorn
Campground JSON map palette consistency
…picuous Remove inconspicuous trait
…harvesting Practice survival when harvesting
…e it (#33569) * Create JSON_INHERITANCE.md Made the contents look exactly like the wiki page https://github.com/CleverRaven/Cataclysm-DDA/wiki/Inheritance and also added a short guide on how to find out of the type you use in JSON is has copy-from supported. * Linked copy-from, delete, extend and abstract to the new inheritance.md file and removed the example of copy-from
Martial Arts Rebalance for Karate
* from 1 came many (gunpowders) Gotta keep em separated * recipe to make uniform powder. * Gunpowder spawn chances * snippets, artillery powder desc * update min qty 1lb is most common for powders * steel mesh sources * sieve recipe and req add * Powder overlap first attempt at getting powder overlap on paper. needs work still. * -BP 40mm * split pistol+shot powder * shotgun powder overlaps
* hand fit mags * hk->H&K * casehead reqs * mag desc update * sheet strippers * delete .38 luty * axe 22, nerf 40, 762 and 762 recipes
Due to duct tape recipe.
* Add u_learn_recipe effect and u_know_recipe condition * Add new mission MISSION_LEARN_ABOUT_CATTAIL_JELLY
Make makeshift glaive fragile.
* Change throwable extinguisher to perish after use * Fixup removal of throwable extinguisher
RedShakespeare
pushed a commit
that referenced
this pull request
May 10, 2020
The function `are_requirements_nearby` accesses `player::backlog::front()`, which causes UB when the `backlog` list is empty. This is usually checked by the caller, but there is at least one way to reach this function without that check: ``` #2 0x000000000083dfaa in string_id<activity_type>::operator== (rhs=..., this=0xdf1b460) at src/player_activity.h:93 #3 are_requirements_nearby (loot_spots=std::vector of length 21, capacity 32 = {...}, needed_things=..., p=..., activity_to_restore=..., in_loot_zones=true, src_loc=...) at src/activity_item_handling.cpp:1113 #4 0x0000000000843a46 in generic_multi_activity_check_requirement (p=..., act_id=..., act_info=..., src=..., src_loc=..., src_set=std::unordered_set with 1 element = {...}, check_only=false) at src/activity_item_handling.cpp:2676 #5 0x0000000000852813 in generic_multi_activity_handler (act=..., p=..., check_only=check_only@entry=false) at src/activity_item_handling.cpp:2885 #6 0x0000000000800896 in activity_handlers::multiple_butcher_do_turn (act=<optimized out>, p=<optimized out>) at src/activity_handlers.cpp:3822 #7 0x000000000082b248 in std::_Function_handler<void (player_activity*, player*), void (*)(player_activity*, player*)>::_M_invoke(std::_Any_data const&, player_activity*&&, player*&&) (__functor=..., __args#0=<optimized out>, __args#1=<optimized out>) at /usr/include/c++/8/bits/std_function.h:88 #8 0x00000000008630e3 in std::function<void (player_activity*, player*)>::operator()(player_activity*, player*) const (this=<optimized out>, __args#0=<optimized out>, __args#0@entry=0xdf1b330, __args#1=<optimized out>, __args#1@entry=0xdf1ae50) at /usr/include/c++/8/bits/std_function.h:260 #9 0x0000000000860306 in activity_type::call_do_turn (this=0x2c3c930, act=act@entry=0xdf1b330, p=p@entry=0xdf1ae50) at src/activity_type.cpp:118 #10 0x00000000014a968b in player_activity::do_turn (this=this@entry=0xdf1b330, p=...) at src/player_activity.cpp:237 #11 0x00000000013092a4 in npc::do_player_activity (this=this@entry=0xdf1ae50) at src/npcmove.cpp:3299 #12 0x0000000001322a07 in npc::execute_action (this=this@entry=0xdf1ae50, action=<optimized out>, action@entry=npc_player_activity) at src/npcmove.cpp:1237 #13 0x000000000132690a in npc::move (this=this@entry=0xdf1ae50) at src/npcmove.cpp:907 ``` This adds a simple check within the function.
RedShakespeare
pushed a commit
that referenced
this pull request
May 19, 2020
Long Overdue Update #6
RedShakespeare
pushed a commit
that referenced
this pull request
May 19, 2020
Update furniture-fungal.json
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.
As above.