Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remaining fixes for 51.01-beta21 #800

Merged
merged 1 commit into from
Aug 31, 2024
Merged

Remaining fixes for 51.01-beta21 #800

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 40 additions & 43 deletions df.advmode.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,64 +2,52 @@
<enum-type type-name='ui_advmode_menu'> bay12: AdventureViewModes
<enum-item name='None' value='-1'/>
<enum-item name='Default'/> MAIN
<enum-item name='Look'/>
<enum-item name='Look'/> LOOK
<enum-item name='ConversationAddress'/> CONVERSATION_START_NEW
<enum-item name='ConversationSelect'/> CONVERSATION_LIST
<enum-item name='ConversationSpeak'/> CONVERATION_TALK
5
<enum-item name='Inventory'/>
<enum-item name='Drop'/>
<enum-item name='ThrowItem'/>
<enum-item name='Wear'/>
<enum-item name='Remove'/>
10
<enum-item name='Interact'/>
<enum-item name='Put'/>
<enum-item name='PutContainer'/>
<enum-item name='Eat'/>
<enum-item name='ThrowAim'/>
15
<enum-item name='Fire'/>
<enum-item name='Get'/>
<enum-item name='Inventory'/> INVENTORY_LOOK
<enum-item name='Drop'/> INVENTORY_DROP
<enum-item name='ThrowItem'/> INVENTORY_THROW
<enum-item name='Wear'/> INVENTORY_WEAR
<enum-item name='Remove'/> INVENTORY_REMOVE
<enum-item name='Interact'/> INVENTORY_INTERACT
<enum-item name='Put'/> INVENTORY_PUTIN
<enum-item name='PutContainer'/> INVENTORY_PUTIN2
<enum-item name='Eat'/> INVENTORY_EATDRINK
<enum-item name='ThrowAim'/> THROW
<enum-item name='Fire'/> SHOOET
<enum-item name='Get'/> PICUP
<enum-item name='GetAmount'/> PICKUP_AMOUNT
<enum-item name='CombatPrefs'/>
<enum-item name='Companions'/>
20
<enum-item name='MovementPrefs'/>
<enum-item name='CombatPrefs'/> COMBAT
<enum-item name='Companions'/> COMPANIONS
<enum-item name='MovementPrefs'/> MOVEMENT
<enum-item name='SpeedPrefs'/> SPEED_SNEAK
<enum-item name='InteractAction'/>
<enum-item name='MoveCarefully'/>
<enum-item name='Announcements'/>
25
<enum-item name='UseBuilding' comment='Interacting with a lever or a statue, for example'/>
<enum-item name='Travel'/>
<enum-item name='TravelSleep'/>
<enum-item name='ViewFreshestTrack' comment='A_FRESHEST_TRACK'/>
<enum-item name='SleepConfirm'/>
30
<enum-item name='SelectInteractionTarget'/>
<enum-item name='InteractChoices' comment='For example, after inputting A_BUILDING while standing on the same tile as a lever and a minecart'/>
<enum-item name='InteractVehicle' comment='Interacting with a minecart'/>
<enum-item name='FallAction'/>
<enum-item name='ViewTracks'/>
35
<enum-item name='InteractAction'/> INTERACT
<enum-item name='MoveCarefully'/> MOVE
<enum-item name='Announcements'/> ANNOUNCEMENTS
<enum-item name='Travel'/> REGION_MAIN
<enum-item name='TravelSleep'/> REGION_SLEEP
<enum-item name='ViewFreshestTrack' comment='A_FRESHEST_TRACK'/> SPOOR
<enum-item name='SleepConfirm'/> SLEEP_CONFIRM
<enum-item name='SelectInteractionTarget'/> INTERACTION_TARGET
<enum-item name='FallAction'/> REACTION_MOMENT_NO_ATTACKER
<enum-item name='ViewTracks'/> LOOK_SPOOR
<enum-item name='AttackCreature'/> ATTACKCREATURE_UNIT_CHOICE
<enum-item name='AttackConfirm'/> ATTACKCREATURE_CONFIRM
<enum-item name='AttackType'/> ATTACKCREATURE_MOVE_CHOICE
<enum-item name='AttackBodypart'/> ATTACKCREATURE_AIM_TARGET
<enum-item name='AttackStrike'/> ATTACKCREATURE_AIM_ATTACK
40
<enum-item name='DefendParry'/> ATTACKCREATURE_PARRY_CHOICE
<enum-item name='DefendBlock'/> ATTACKCREATURE_BLOCK_CHOICE
<enum-item name='DodgeDirection'/> ATTACKCREATURE_DODGE_CHOICE
<enum-item name='PerformanceSelect'/> START_PERFORMANCE
<enum-item name='InterruptPerformanceConfirm'/> MOVE_CONFIRM
45
<enum-item name='Build'/>
<enum-item name='AssumeIdentity'/>
<enum-item name='NameItem'/>
<enum-item name='BecomePartyMember'/>
<enum-item name='PartyTacticalSettings'/>
<enum-item name='Build'/> CONSTRUCTION
<enum-item name='AssumeIdentity'/> ASSUME_IDENTITY
<enum-item name='NameItem'/> NAME_ITEM
<enum-item name='BecomePartyMember'/> BECOME_COMPANION
<enum-item name='PartyTacticalSettings'/> COMPANION_TACTICAL_SETTINGS
</enum-type>

<enum-type type-name='talk_choice_type' base-type='int32_t'> bay12: ConversationChoiceType
Expand Down Expand Up @@ -1283,6 +1271,15 @@
<int32_t name='building_id' ref-target='building'/>
</class-type>

<class-type type-name='adventure_movement_building_interact_raise_well_bucketst' inherits-from='adventure_movement_building_interactst'/>
<class-type type-name='adventure_movement_building_interact_lower_well_bucketst' inherits-from='adventure_movement_building_interactst'/>
<class-type type-name='adventure_movement_building_interact_pull_leverst' inherits-from='adventure_movement_building_interactst'/>
<class-type type-name='adventure_movement_building_interact_break_in_hatchst' inherits-from='adventure_movement_building_interactst'/>
<class-type type-name='adventure_movement_building_interact_pick_hatch_lockst' inherits-from='adventure_movement_building_interactst'/>
<class-type type-name='adventure_movement_building_interact_bash_down_doorst' inherits-from='adventure_movement_building_interactst'/>
<class-type type-name='adventure_movement_building_interact_pick_door_lockst' inherits-from='adventure_movement_building_interactst'/>
<class-type type-name='adventure_movement_building_interact_topple_statuest' inherits-from='adventure_movement_building_interactst'/>

<class-type type-name='adventure_movement_item_interactst' inherits-from='adventure_movement_optionst'>
<int32_t name='item_id' ref-target='item'/>
</class-type>
Expand Down
Loading