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.

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

Assorted fixes #786

Merged
merged 1 commit into from
Jun 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions df.creature-raws.xml
Original file line number Diff line number Diff line change
Expand Up @@ -467,9 +467,9 @@
<int32_t name='vascular'/>
<int32_t name='pain_receptors'/>

<int32_t name='position'/>
<enum name='relation' type-name='body_part_position_type'/>
<enum name='relation_bp' type-name='body_part_relation_type'/>
<enum name='position' type-name='body_part_position_type'/>
<enum name='relation' type-name='body_part_relation_type'/>
<int16_t name='relation_bp'/>

<stl-vector name='bp_modifiers' type-name='int32_t'
refers-to='$$._global._upglobal._upglobal._upglobal.bp_appearance.modifier_idx[$].refers-to'/>
Expand Down
2 changes: 1 addition & 1 deletion df.entities.xml
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@
<stl-vector name='diplomacy'> sorted by group_id
<pointer> bay12: diplomacy_statest
<int32_t name='group_id' ref-target='historical_entity'/>
<enum name='relation'> bay12: DiplomacyStateType
<enum name='relation' base-type='int16_t'> bay12: DiplomacyStateType
<enum-item name='Peace'/>
<enum-item name='TotalWar'/>
<enum-item name='NoContact'/>
Expand Down