DFHack / df-structures

Dwarf Fortress data structure descriptions
https://github.com/DFHack/dfhack
118 stars 81 forks source link

Sync adventure structures to Toady headers #783

Closed quietust closed 5 months ago

quietust commented 5 months ago

I strongly suspect all of the enums in adventurest will result in conflicts due to their "NONE" values (like they did in main_interface) - if they do, I'll split them out .

github-actions[bot] commented 5 months ago

The sizes of the following types have changed in this pull request. Please verify that this is intentional. Note that renamed types are not currently detected and will also be listed here.

Type Platform Previous size New size (this PR) Change
adventure_environment_place_on_pack_animalst linux64 0 32 +32
adventure_environment_place_on_pack_animalst windows64 0 32 +32
adventure_item_interact_roll_allst linux64 0 8 +8
adventure_item_interact_roll_allst windows64 0 8 +8
adventure_item_interact_rollst linux64 0 8 +8
adventure_item_interact_rollst windows64 0 8 +8
adventure_movement_claim_petst linux64 0 32 +32
adventure_movement_claim_petst windows64 0 32 +32
adventure_movement_dismountst linux64 0 24 +24
adventure_movement_dismountst windows64 0 24 +24
adventure_movement_lead_animalst linux64 0 32 +32
adventure_movement_lead_animalst windows64 0 32 +32
adventure_movement_mountst linux64 0 40 +40
adventure_movement_mountst windows64 0 40 +40
adventure_movement_stop_lead_animalst linux64 0 32 +32
adventure_movement_stop_lead_animalst windows64 0 32 +32
assume_identity_menu_choicest linux64 0 128 +128
assume_identity_menu_choicest windows64 0 128 +128
attack_chance_modifierst linux64 0 32 +32
attack_chance_modifierst windows64 0 32 +32
conversation linux64 280 0 -280
conversation windows64 280 0 -280
interaction_target_instance_listst linux64 0 32 +32
interaction_target_instance_listst windows64 0 32 +32
performance_menu_choice_type linux64 0 4 +4
performance_menu_choice_type windows64 0 4 +4
performance_menu_choicest linux64 0 120 +120
performance_menu_choicest windows64 0 120 +120
text_info_element_longst linux64 16 0 -16
text_info_element_longst windows64 16 0 -16
text_info_element_stringst linux64 40 0 -40
text_info_element_stringst windows64 40 0 -40
text_info_elementst linux64 8 0 -8
text_info_elementst windows64 8 0 -8
ui_advmode_menu linux64 2 4 +2
ui_advmode_menu windows64 2 4 +2

This is an automated comment. Please leave a reply if you think that the above information is incorrect.

myk002 commented 5 months ago

is this using the v50 headers or the v51? should it be targeting the master branch or the adv-beta branch?

edit: answering my own question, this looks like v50 and the v51 changes aren't really touched. is that right?

quietust commented 5 months ago

Correct, this is just updating the Adventurer classes to match 50.13 so I can just diff -urN 50.13 51.01 to see exactly what needs to be changed.