catch a mouse #30

Maleclypse · 2020-10-08T01:10:07Z

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

Update #15

Update #16

update #17

Replace floats with new zlight_slope struct. This now passes 2 of the tests that the old recursive algorithm was failing, but encounters an infinite loop in some cases without the fuzzing that seems to have been hiding a major bug. Fix a few other minor bugs.

This is the best way I could find to fix the infinite loop without creating tons of artifacts.

- Add casting direction diagrams - Remove unnecessary declaration

This commit adds a new cast_vertical_zlight_segment function with different iteration logic than the now renamed cast_horizontal_zlight_segment. This duplicates a lot of code, but imo is worth it for the readablity gains over adding a lot more contitonals to the iteration logic to handle zx and zy template parameters properly.

and remove the code that allows disabling it

It somehow took me until now to realize that y coordinates are counted from the "top" of the screen not the bottom, so fix the comment diagrams

This change fixes the following linker error when compiling cata_test on Linux, using either gcc or clang: /usr/bin/ld: obj/tiles/test_main.o: undefined reference to symbol 'pthread_create@@GLIBC_2.2.5' /usr/bin/ld: /lib/x86_64-linux-gnu/libpthread.so.0: error adding symbols: DSO missing from command line

Since it doesn't makes sense to have to cut up a sheet into rags, just to spend 40 hours sewing it back together so it's "Patchwork" before you can make stuff. The cutting into rags still gives too much resources, but that will need to be fixed elsewhere. Also ideally sheet would be added to the tailoring requirements, but that might require some rebalancing elsewhere unless it allows 0.15 as a quantity there

Fix 3d shadowcasting 4

pr #40407 removed the "fetch a flu shot" (ranch_nurse_mission_10) from the nurse doc mission sequence. Unfortunately, starting that mission triggered the map changes that spawn the Refugee Ranch doctor who can install CBMs nearly faultlessly. Clean out the "fetch a flu shot" mission JSON entirely, and add "start": "ranch_nurse_9" to the next mission's JSON definition, so that ranch doctor will spawn.

tacoma commune: re-enable spawning of the ranch doctor

…44646) The rope made from cloth can just be cut up, the multiple reversible flags were causing glitches.

it's next to the mojocycle scroll

Imbue scent map (de)serialization stream with the C locale

Use class translation in construction and group construction by group id instead of description

Fix inventory UI highlight not displayed when opening the UI or resizing the window

Merge sealed and unsealed versions of plastic bottle and jug

Use class translation for faction description and other translation updates

Weight cache invalidation where needed

shadowcasting benchmark

Move json flags to json

refactor spells to use "shape" enums

Interface: 3 additions to martial arts style info

…te (#44622)

* Update corpses.json * Update corpses.json

* Npc retreat2 (#29) * Expose NPC AI consts to options I will probably need a little help with this * Restore 'regroup on player' Now it won't kick in if the NPC is already close to you * Remove unnecessary messages * Npc retreat2 (#30) * Expose NPC AI consts to options I will probably need a little help with this * Restore 'regroup on player' Now it won't kick in if the NPC is already close to you * Remove unnecessary messages * Update data/core/game_balance.json * Update modinfo.json * Update modinfo.json * delete dirty commits from my master I hate the web interface

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 #36 0x50f1ece in main src/main.cpp:792 #37 0x7fdc43fa9b89 in __libc_start_call_main (/lib64/libc.so.6+0x27b89) (BuildId: f888be5f5e7d58e04cabb8c675c7ab94e77dd68c) #38 0x7fdc43fa9c4a in __libc_start_main_alias_2 (/lib64/libc.so.6+0x27c4a) (BuildId: f888be5f5e7d58e04cabb8c675c7ab94e77dd68c) #39 0x1bec874 in _start (/home/cdda/git/Cataclysm-DDA/cataclysm-tiles+0x1bec874) (BuildId: be24990d1723c8da00f3e8701793ab983cf64dcc) ```

Xenomorph-III and others added 30 commits July 10, 2020 17:51

Merge pull request #15 from CleverRaven/master

56974c5

Update #15

Merge pull request #16 from CleverRaven/master

c1d0d5b

Update #16

Merge pull request #17 from CleverRaven/master

ff24cac

update #17

Extend shadowcasting test to 3D

b10cb43

Add some 3D tests.

32aa793

Extract cast_zlight to a dedicated code module

5049add

WIP de-recursify shadowcasting

df7fbcd

More bugfixes and kill the inifinte loop

19f46fe

This is the best way I could find to fix the infinite loop without creating tons of artifacts.

Add more comments and clean up formatting

99c6bf4

- Add casting direction diagrams - Remove unnecessary declaration

Add a helper to reduce code duplication

1e53292

Use int_least8_t for rise and run

b5efff2

Fix memory leak

df8ae4a

Cleanup template parameters

335ac8f

Test 3d fov in all vision tests

da27969

and remove the code that allows disabling it

Rename check to is_transparent and fix comments

59654c8

It somehow took me until now to realize that y coordinates are counted from the "top" of the screen not the bottom, so fix the comment diagrams

Fix erroneous cumulative transparency incrementation

c4a3c05

Add a shadowcasting unit test

88b79ee

Clarify some shadowcasting test details

9f6b246

Streamline shadowcasting implementation

1b3a781

Fix empty vehicle symbol causing displaced console output

c458b17

Update newcharacter.cpp

c3426ab

fixes

4028b73

fix 2

30b12b4

retrodays - fix missing vehicle parts

fe74f6a

retrodays - correct tiles indices for 20x20 tiles

e50c436

Merge pull request #42835 from kevingranade/fix-3d-shadowcasting-4

b19f1e7

Fix 3d shadowcasting 4

Qrox and others added 27 commits October 7, 2020 19:21

Use class translation for faction description

ab84cee

Make some translator comments extracted

7ff70d9

Fix redundant spaces at end of strings

68e4602

Update doc

c341093

Merge pull request #44692 from mlangsdorf/ranch_doctor_spawn_fix

c929d13

tacoma commune: re-enable spawning of the ranch doctor

move ropes to their own recipe file and remove cloth reversible rope (#…

777e59a

…44646) The rope made from cloth can just be cut up, the multiple reversible flags were causing glitches.

remove duplicate technomancer item group

cc51b1f

add rings of wizardry (+max mana)

1925d0e

add minor ring of wizardry to technomancer house

795a210

it's next to the mojocycle scroll

adjust cast time and cost of mojocycle

28d7e28

add bullet armor to magic rings and bracers of protection

c1c07df

Merge pull request #44659 from Qrox/imbue

5a0f553

Imbue scent map (de)serialization stream with the C locale

Merge pull request #44566 from Qrox/translation-7

e03b5d1

Use class translation in construction and group construction by group id instead of description

Merge pull request #44633 from Qrox/inv-highlight

33b3b31

Fix inventory UI highlight not displayed when opening the UI or resizing the window

Merge pull request #44640 from Qrox/container

c195c0b

Merge sealed and unsealed versions of plastic bottle and jug

Merge pull request #44691 from Qrox/translation-8

40e880e

Use class translation for faction description and other translation updates

Merge pull request #44661 from RoyBerube/tank_weight

d4ab786

Weight cache invalidation where needed

Merge pull request #44557 from kevingranade/shadowcasting-benchmark

82beb80

shadowcasting benchmark

Merge pull request #44626 from irwiss/move-json-flags-to-json

19d7e95

Move json flags to json

simplify item::damage_level() (#44563)

0692265

Extends the new Satiety row to more information menus (#44565)

71a3d2f

Merge pull request #44481 from KorGgenT/spell-shapes

49a278e

refactor spells to use "shape" enums

Merge pull request #44599 from Pupsi-Mupsi/PM-martial

71c1d5b

Interface: 3 additions to martial arts style info

Fix some conflicting profession clothes, add MD trait where appropria…

3586ad4

…te (#44622)

More randomized amounts in itemgroups (#44629)

d194434

[Aftershock] Missing Broken Robot items (#44600)

c9d3ac2

* Update corpses.json * Update corpses.json

Maleclypse merged commit 1dd84e1 into Maleclypse:master Oct 8, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

catch a mouse #30

catch a mouse #30

Maleclypse commented Oct 8, 2020

catch a mouse #30

catch a mouse #30

Conversation

Maleclypse commented Oct 8, 2020

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context