merge master into branch to enable mission completion #22

I-am-Erk · 2021-09-23T23:45:08Z

Summary

Category "Brief description"

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

…into base_camp_reorganization

…n format mandate

…into base_camp_reorganization

Fix the bike shop variant 1 having an empty roof

Changed stairs down to ladder down

Fixes #51772 Co-authored-by: David Seguin <[email protected]>

These ids were previously just using strings; better to use a dedicated string_id type. This required adding an actual type for the string_id to point to in each case, wrapping the collection of mapgen_function_json objects.

As suggested in #50866, require all recipe definitions to provide a category and subcategory when loading from JSON.

Base camp reorganization

See <https://discord.com/channels/598523535169945603/598614717799596055/890213920957161472> on the dev discord.

Disable one LGTM checks to see if there's hope of reducing the runtime thereby.

* Mythos Mod Resubmission * Remove Occulti as maintainer

Co-authored-by: Saicchi <[email protected]> Co-authored-by: Kevin Granade <[email protected]>

* Add blacksmithing tongs. The tongs in game wouldn't be able to carry around a four kilo zweihander. They are designed for cooking and flipping food, so they are very lightweight and thing, they would most likely bend under the heat of the hot metal. * Added the need to use blacksmithing (flatjaw) tongs for the Zweihander Not using tongs for smithing is almost impossible. * Change the blacksmithing toolset to include the tongs. I also removed the tongs from the tools on the zweihander. Co-authored-by: Anton Burmistrov <[email protected]> Co-authored-by: Kevin Granade <[email protected]>

* More granular json-style and astyle

Force recipes to provide (sub)category

* Melee practice Added some basic melee practice recipes, including 2 for training dodge. * Training dummy for practice recipes * Dummy recipe and resolve problems * Intermediate recipes and heavy training dummy * Changed the armored dummy recipe The recipe is inspired by the scrap suit recipe. * Added tanto as a possible weapon for stabbing training * Punching bag Co-authored-by: Marloss <[email protected]>

Fix bike shop variant's roof

Fix typo in "Storehouse survey" blueprint name

…xtra Jsonified dead scientists map extra

Use string_id for update_mapgen and nested_mapgen

Remove duplicate shortcut keys from interaction menu

Update the table of contents in doc/JSON_INFO.md

Co-authored-by: Kevin Granade <[email protected]>

…eakpoints (#51822) * Let contributors specify the default weakpoint, by providing an empty ID * Add support for weakpoint inheritance.

…51791) * debug_fold_repetition: Fold identical errors to reduce log spam * debug_fold_repetition: added timestamp and timeout timestamp for repeated error folding group is that of the last folded error timeout is currently hardcoded to 100ms. If another repeated error is registered that would be folded but is >100ms after the previous error it starts a new folding group * debug_fold_repetitions: bookended fold for readability, made output DRY It's a little easier to read the log as `[First]<folded>[Last]` than `[First]<folded with last timestamp>` Need to test folding output during deinit and DebugLog, made a function to remove repetition. * debug_fold_repetitions: excess repetition error to forced prompt As logged error the excessive repetition error causes breaks in folds which make debug.log less clear while reading, and does not add information Forced prompting once excess threshold is reached will prompt once per excessive repetition set.

…51794) Fixes #51688

* update m231 Updated price(https://www.invaluable.com/auction-lot/incredibly-rare-colt-m231-port-firing-u-s-propert-2086-c-3574a02a1e), adjusted desc, set sight disp to that of other no-sight guns, adjusted mod locations.

)

* Complete missions * Update npctalk.cpp * Update npctalk.cpp

This reverts commit 7154c2d.

…23) This reverts commit 7154c2d.

* Add missing was_loaded initialization We forgot to initialize was_loaded in profession_group I found this bug thanks to UndefinedBehaviorSanitizer ```c++ src/profession_group.h:8:8: runtime error: load of value 60, which is not a valid value for type 'bool' #0 0x6fa4312 in profession_group::profession_group(profession_group const&) src/profession_group.h:8 #1 0x6fb241e in void std::__new_allocator<profession_group>::construct<profession_group, profession_group const&>(profession_group*, profession_group const&) /usr/include/c++/13/bits/new_allocator.h:187 #2 0x6fb241e in void std::allocator_traits<std::allocator<profession_group> >::construct<profession_group, profession_group const&>(std::allocator<profession_group>&, profession_group*, profession_group const&) /usr/include/c++/13/bits/alloc_traits.h:537 #3 0x6fb241e in void std::vector<profession_group, std::allocator<profession_group> >::_M_realloc_insert<profession_group const&>(__gnu_cxx::__normal_iterator<profession_group*, std::vector<profession_group, std::allocator<profession_group> > >, profession_group const&) /usr/include/c++/13/bits/vector.tcc:468 #4 0x6fb2911 in std::vector<profession_group, std::allocator<profession_group> >::push_back(profession_group const&) /usr/include/c++/13/bits/stl_vector.h:1289 #5 0x6fb2c14 in generic_factory<profession_group>::insert(profession_group const&) src/generic_factory.h:391 #6 0x6fb61a7 in generic_factory<profession_group>::load(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) src/generic_factory.h:304 #7 0x6fa0efd in profession_group::load_profession_group(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) src/profession_group.cpp:25 #8 0x4294940 in void std::__invoke_impl<void, void (*&)(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&), JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&>(std::__invoke_other, void (*&)(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&), JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /usr/include/c++/13/bits/invoke.h:61 #9 0x4294976 in std::enable_if<is_invocable_r_v<void, void (*&)(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&), JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&>, void>::type std::__invoke_r<void, void (*&)(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&), JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&>(void (*&)(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&), JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /usr/include/c++/13/bits/invoke.h:111 #10 0x4294976 in std::_Function_handler<void (JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&), void (*)(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>::_M_invoke(std::_Any_data const&, JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) /usr/include/c++/13/bits/std_function.h:290 #11 0x4290c79 in std::function<void (JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>::operator()(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const /usr/include/c++/13/bits/std_function.h:591 #12 0x426934f in operator() src/init.cpp:227 #13 0x426934f in __invoke_impl<void, DynamicDataLoader::add(const std::string&, const std::function<void(const JsonObject&, const std::__cxx11::basic_string<char>&)>&)::<lambda(const JsonObject&, const std::string&, const cata_path&, const cata_path&)>&, const JsonObject&, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, const cata_path&, const cata_path&> /usr/include/c++/13/bits/invoke.h:61 #14 0x426934f in __invoke_r<void, DynamicDataLoader::add(const std::string&, const std::function<void(const JsonObject&, const std::__cxx11::basic_string<char>&)>&)::<lambda(const JsonObject&, const std::string&, const cata_path&, const cata_path&)>&, const JsonObject&, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, const cata_path&, const cata_path&> /usr/include/c++/13/bits/invoke.h:111 #15 0x426934f in _M_invoke /usr/include/c++/13/bits/std_function.h:290 #16 0x42904f3 in std::function<void (JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, cata_path const&, cata_path const&)>::operator()(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, cata_path const&, cata_path const&) const /usr/include/c++/13/bits/std_function.h:591 #17 0x4284949 in DynamicDataLoader::load_object(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, cata_path const&, cata_path const&) src/init.cpp:137 #18 0x4285c32 in DynamicDataLoader::load_all_from_json(JsonValue const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, loading_ui&, cata_path const&, cata_path const&) src/init.cpp:540 #19 0x4286744 in DynamicDataLoader::load_data_from_path(cata_path const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, loading_ui&) src/init.cpp:521 #20 0x3ca25fa in game::load_data_from_dir(cata_path const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, loading_ui&) src/game.cpp:571 #21 0x3d21130 in game::load_packs(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<string_id<MOD_INFORMATION>, std::allocator<string_id<MOD_INFORMATION> > > const&, loading_ui&) src/game.cpp:3265 #22 0x3d518b5 in game::load_world_modfiles(loading_ui&) src/game.cpp:3235 #23 0x3e055d0 in game::setup() src/game.cpp:756 #24 0x5111cc3 in main_menu::new_character_tab() src/main_menu.cpp:972 #25 0x5127aea in main_menu::opening_screen() src/main_menu.cpp:863 #26 0x50f1e5e in main src/main.cpp:792 #27 0x7f7a489cfb89 in __libc_start_call_main (/lib64/libc.so.6+0x27b89) (BuildId: f888be5f5e7d58e04cabb8c675c7ab94e77dd68c) #28 0x7f7a489cfc4a in __libc_start_main_alias_2 (/lib64/libc.so.6+0x27c4a) (BuildId: f888be5f5e7d58e04cabb8c675c7ab94e77dd68c) #29 0x1bec804 in _start (/home/cdda/git/Cataclysm-DDA/cataclysm-tiles+0x1bec804) (BuildId: 1a0225eb0946b150a1f9b1759d512b53fde7f1d0) ``` * Make overmap_terrain_coverage less likely to produce spurious errors * Revert "Make overmap_terrain_coverage less likely to produce spurious errors" This reverts commit 6134a08.

If melee_actori.is_grab is false grab.exclusive_grab and grab.respect_seatbelts were not initialized. This was causing errors under -fsanitize=undefined The solution initialize the booleans to value that match their defaults ```C++ src/mattack_actors.h:75:8: runtime error: load of value 190, which is not a valid value for type 'bool' #0 0x5a9b6fe in grab::grab(grab const&) src/mattack_actors.h:75 #1 0x5ab7635 in melee_actor::melee_actor(melee_actor const&) src/mattack_actors.h:106 #2 0x5ab8412 in std::__detail::_MakeUniq<melee_actor>::__single_object std::make_unique<melee_actor, melee_actor const&>(melee_actor const&) /usr/include/c++/13/bits/unique_ptr.h:1070 #3 0x5a87e4c in melee_actor::clone() const src/mattack_actors.cpp:962 #4 0x207632c in cata::clone_ptr<mattack_actor>::clone_ptr(cata::clone_ptr<mattack_actor> const&) src/clone_ptr.h:18 #5 0x6085941 in mtype_special_attack::mtype_special_attack(mtype_special_attack const&) src/mattack_common.h:47 #6 0x6085941 in std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack, true>(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_pair.h:559 #7 0x6085a2b in void std::__new_allocator<std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::construct<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/new_allocator.h:187 #8 0x6085a2b in void std::allocator_traits<std::allocator<std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > > >::construct<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::allocator<std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >&, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/alloc_traits.h:537 #9 0x6085a2b in void std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::_M_construct_node<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_tree.h:597 #10 0x6085b06 in std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >* std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::_M_create_node<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_tree.h:614 #11 0x6085b71 in std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::_Auto_node::_Auto_node<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_tree.h:1637 #12 0x6085c9d in std::_Rb_tree_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::_M_emplace_hint_unique<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::_Rb_tree_const_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_tree.h:2462 #13 0x608618f in std::_Rb_tree_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > std::map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, mtype_special_attack, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::emplace_hint<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::_Rb_tree_const_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_map.h:640 #14 0x608618f in std::pair<std::_Rb_tree_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, bool> std::map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, mtype_special_attack, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::emplace<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_map.h:601 #15 0x5ff3881 in MonsterGenerator::add_attack(mtype_special_attack const&) src/monstergenerator.cpp:1312 #16 0x5ffafa5 in MonsterGenerator::load_monster_attack(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) src/monstergenerator.cpp:1376 #17 0x4262e91 in operator() src/init.cpp:466 #18 0x4262e91 in __invoke_impl<void, DynamicDataLoader::initialize()::<lambda(const JsonObject&, const std::string&)>&, const JsonObject&, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&> /usr/include/c++/13/bits/invoke.h:61 #19 0x4262e91 in __invoke_r<void, DynamicDataLoader::initialize()::<lambda(const JsonObject&, const std::string&)>&, const JsonObject&, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&> /usr/include/c++/13/bits/invoke.h:111 #20 0x4262e91 in _M_invoke /usr/include/c++/13/bits/std_function.h:290 #21 0x4290ce9 in std::function<void (JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>::operator()(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const /usr/include/c++/13/bits/std_function.h:591 #22 0x42693bf in operator() src/init.cpp:227 #23 0x42693bf in __invoke_impl<void, DynamicDataLoader::add(const std::string&, const std::function<void(const JsonObject&, const std::__cxx11::basic_string<char>&)>&)::<lambda(const JsonObject&, const std::string&, const cata_path&, const cata_path&)>&, const JsonObject&, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, const cata_path&, const cata_path&> /usr/include/c++/13/bits/invoke.h:61 #24 0x42693bf in __invoke_r<void, DynamicDataLoader::add(const std::string&, const std::function<void(const JsonObject&, const std::__cxx11::basic_string<char>&)>&)::<lambda(const JsonObject&, const std::string&, const cata_path&, const cata_path&)>&, const JsonObject&, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, const cata_path&, const cata_path&> /usr/include/c++/13/bits/invoke.h:111 #25 0x42693bf in _M_invoke /usr/include/c++/13/bits/std_function.h:290 #26 0x4290563 in std::function<void (JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, cata_path const&, cata_path const&)>::operator()(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, cata_path const&, cata_path const&) const /usr/include/c++/13/bits/std_function.h:591 #27 0x42849b9 in DynamicDataLoader::load_object(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, cata_path const&, cata_path const&) src/init.cpp:137 #28 0x4285ca2 in DynamicDataLoader::load_all_from_json(JsonValue const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, loading_ui&, cata_path const&, cata_path const&) src/init.cpp:540 #29 0x42867b4 in DynamicDataLoader::load_data_from_path(cata_path const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, loading_ui&) src/init.cpp:521 #30 0x3ca266a in game::load_data_from_dir(cata_path const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, loading_ui&) src/game.cpp:571 #31 0x3d211a0 in game::load_packs(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<string_id<MOD_INFORMATION>, std::allocator<string_id<MOD_INFORMATION> > > const&, loading_ui&) src/game.cpp:3265 #32 0x3d51925 in game::load_world_modfiles(loading_ui&) src/game.cpp:3235 #33 0x3e05640 in game::setup() src/game.cpp:756 #34 0x5111d33 in main_menu::new_character_tab() src/main_menu.cpp:972 #35 0x5127b5a in main_menu::opening_screen() src/main_menu.cpp:863 CleverRaven#36 0x50f1ece in main src/main.cpp:792 CleverRaven#37 0x7fdc43fa9b89 in __libc_start_call_main (/lib64/libc.so.6+0x27b89) (BuildId: f888be5f5e7d58e04cabb8c675c7ab94e77dd68c) CleverRaven#38 0x7fdc43fa9c4a in __libc_start_main_alias_2 (/lib64/libc.so.6+0x27c4a) (BuildId: f888be5f5e7d58e04cabb8c675c7ab94e77dd68c) CleverRaven#39 0x1bec874 in _start (/home/cdda/git/Cataclysm-DDA/cataclysm-tiles+0x1bec874) (BuildId: be24990d1723c8da00f3e8701793ab983cf64dcc) ```

PatrikLundell and others added 30 commits November 22, 2020 11:35

reorganized to support expansion

5ae246f

reorganized to support expansion

036b6a8

removed sentences that shouldn't be there

f231595

fixed log stable appearing as kitchen construction

13ca402

Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA …

305a9ed

…into base_camp_reorganization

Reworked to push expansions back to the top level + doc

46c344c

Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA …

a7c6896

…into base_camp_reorganization

testing disallows base name recipe changes

9a0fe3f

removal of characters in middle of token managed to offend secret jso…

23ee5da

…n format mandate

'resolved' conflict

b4d80d4

Adjusted to #46278

32bb236

incorporated some old reverse conflict changes

be98676

merged with experimental

2580515

reorganized the stuff added while this PR was suspended

3d4894f

reorganized the stuff added while this PR was suspended

306b767

Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA …

6613d2a

…into base_camp_reorganization

Fix bike shop variant roof

c5b0b84

Fix the bike shop variant 1 having an empty roof

Change stairs to ladder

460a948

Changed stairs down to ladder down

resolved conflict

253e222

Update the table of contents

3769921

Remove duplicate shortcut keys from interaction menu

e921617

Fixes #51772 Co-authored-by: David Seguin <[email protected]>

Jsonified dead scientists map extra

6c357d8

Use string_id for update_mapgen and nested_mapgen

ab4d7f9

These ids were previously just using strings; better to use a dedicated string_id type. This required adding an actual type for the string_id to point to in each case, wrapping the collection of mapgen_function_json objects.

Update cooking_components.json

6b8e7b3

Force recipes to provide (sub)category

6764eeb

As suggested in #50866, require all recipe definitions to provide a category and subcategory when loading from JSON.

Add subcategory to Magiclysm recipe

04bdea5

Merge pull request #45572 from PatrikLundell/base_camp_reorganization

7a9514f

Base camp reorganization

Clarify description of mon_zombie_dog (#51801)

bbd6a9d

See <https://discord.com/channels/598523535169945603/598614717799596055/890213920957161472> on the dev discord.

Test disabling expensive LGTM checks (#51806)

e1e5c9e

Disable one LGTM checks to see if there's hope of reducing the runtime thereby.

Mythos Mod Resubmission (#51796)

4774b42

* Mythos Mod Resubmission * Remove Occulti as maintainer

Saicchi and others added 24 commits September 23, 2021 09:19

use snippets (#51663)

536dfce

Co-authored-by: Saicchi <[email protected]> Co-authored-by: Kevin Granade <[email protected]>

More granular json-style and astyle (#51731)

81960cd

* More granular json-style and astyle

Merge pull request #51744 from jbytheway/mandatory_categories

34ca637

Force recipes to provide (sub)category

Merge pull request #51729 from SegaSaturnity/bikeshop_fix

79e3e04

Fix bike shop variant's roof

Merge pull request #51831 from CleverRaven/typo-fix

1d330dd

Fix typo in "Storehouse survey" blueprint name

Merge pull request #51795 from Night-Pryanik/jsonify-scientists-map-e…

81d5927

…xtra Jsonified dead scientists map extra

Merge pull request #51800 from jbytheway/nested_mapgen_id

d28f181

Use string_id for update_mapgen and nested_mapgen

Write documentation for neighbor based chunk spawning (#51818)

33bac2a

Merge pull request #51793 from UmbralReaper/cowmenu

1bd7db2

Remove duplicate shortcut keys from interaction menu

Merge pull request #51761 from CleverRaven/update-toc

d6889eb

Update the table of contents in doc/JSON_INFO.md

Resubmit Fix Tire Rims (#51798)

86c3e0a

Update goblin.json (#51799)

38c44df

Fix: Force stereo when opening audio device (#51754)

396b914

Co-authored-by: Kevin Granade <[email protected]>

Add support for weakpoint damage and crit multipliers (#51770)

6e5d3aa

Weakpoints (Part 4.5): Add support for JSON inheritance and default w…

bfe9028

…eakpoints (#51822) * Let contributors specify the default weakpoint, by providing an empty ID * Add support for weakpoint inheritance.

Allow using any tool with the drilling quality to make a draw_plate (#…

7848f4a

…51794) Fixes #51688

The (impotent) Sound and the Fury (#51803)

2068418

* update m231 Updated price(https://www.invaluable.com/auction-lot/incredibly-rare-colt-m231-port-firing-u-s-propert-2086-c-3574a02a1e), adjusted desc, set sight disp to that of other no-sight guns, adjusted mod locations.

Rapidly changing light levels do not grant max vision to turrets (#51815

06ba8c6

)

Update fake.json (#51819)

85c3ddd

Fix process effects crash (#51827)

6ee1821

Add Complete missions dialog function (#51820)

947f8d7

* Complete missions * Update npctalk.cpp * Update npctalk.cpp

I-am-Erk merged commit 7154c2d into I-am-Erk:exodialogue Sep 23, 2021

I-am-Erk added a commit that referenced this pull request Sep 23, 2021

Revert "merge master into branch to enable mission completion (#22)"

862ed80

This reverts commit 7154c2d.

I-am-Erk mentioned this pull request Sep 23, 2021

Revert "merge master into branch to enable mission completion" #23

Merged

I-am-Erk added a commit that referenced this pull request Sep 23, 2021

Revert "merge master into branch to enable mission completion (#22)" (#…

9177ce1

…23) This reverts commit 7154c2d.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge master into branch to enable mission completion #22

merge master into branch to enable mission completion #22

I-am-Erk commented Sep 23, 2021

merge master into branch to enable mission completion #22

merge master into branch to enable mission completion #22

Conversation

I-am-Erk commented Sep 23, 2021

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context