Skip to content

Commit ff2e060

Browse files
authored
Merge pull request #838 from ab9rf/remove-unitst-curse
remove fake `curse` compound in `unitst`
2 parents ae7424d + 672894f commit ff2e060

File tree

2 files changed

+37
-38
lines changed

2 files changed

+37
-38
lines changed

changelog.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Template for new versions:
1919
# Future
2020

2121
## Structures
22+
- removed fake ``curse`` compound in ``unitst`` to resolve an alignment issue
2223

2324
# 51.07-r1
2425

df.unit.xml

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2823,44 +2823,42 @@
28232823
<uint32_t name='dizziness'/>
28242824
</compound>
28252825

2826-
<compound name='curse'> not a compound
2827-
<uint32_t name='flags' comment='moved from end of counters in 0.43.05'/>
2828-
2829-
<bitfield name='add_tags1' type-name='cie_add_tag_mask1'/>
2830-
<bitfield name='rem_tags1' type-name='cie_add_tag_mask1'/>
2831-
<bitfield name='add_tags2' type-name='cie_add_tag_mask2'/>
2832-
<bitfield name='rem_tags2' type-name='cie_add_tag_mask2'/>
2833-
2834-
<bool name='name_visible' since='v0.34.01'/>
2835-
<stl-string name='name' since='v0.34.01'/>
2836-
<stl-string name='name_plural' since='v0.34.01'/>
2837-
<stl-string name='name_adjective' since='v0.34.01'/>
2838-
2839-
<uint8_t name='display_tile'/>
2840-
<int8_t name='display_f'/>
2841-
<int8_t name='display_b'/>
2842-
<int8_t name='display_br'/>
2843-
<uint8_t name='flash_tile'/>
2844-
<int8_t name='flash_f'/>
2845-
<int8_t name='flash_b'/>
2846-
<int8_t name='flash_br'/>
2847-
<uint32_t name='flash_period' since='v0.34.01'/>
2848-
<uint32_t name='flash_time2' since='v0.34.01'/>
2849-
2850-
<stl-vector name='body_appearance' type-name='int32_t'
2851-
index-refers-to='$$._global.caste.ref-target.body_appearance_modifiers[$]'/>
2852-
<stl-vector name='bp_appearance' type-name='int32_t' since='v0.34.01' comment='guess!'
2853-
index-refers-to='$$._global.caste.ref-target.bp_appearance.modifier_idx[$].refers-to'/>
2854-
2855-
<uint32_t name='speed_add' since='v0.34.01'/>
2856-
<uint32_t name='speed_mul_percent' since='v0.34.01' init-value='100'/>
2857-
2858-
<pointer name='attr_change' type-name='curse_attr_change' since='v0.34.01'/>
2859-
<uint32_t name='luck_mul_percent' since='v0.34.01' init-value='100'/>
2860-
<int32_t name='erratic_level' since='v0.42.01'/>
2861-
2862-
<compound name='interaction' type-name='unit_usable_interactionst'/>
2863-
</compound>
2826+
<uint32_t name='uwss_flag' comment='moved from end of counters in 0.43.05'/>
2827+
2828+
<bitfield name='uwss_add_caste_flag' type-name='cie_add_tag_mask1'/>
2829+
<bitfield name='uwss_remove_caste_flag' type-name='cie_add_tag_mask1'/>
2830+
<bitfield name='uwss_add_property' type-name='cie_add_tag_mask2'/>
2831+
<bitfield name='uwss_remove_property' type-name='cie_add_tag_mask2'/>
2832+
2833+
<bool name='uwss_use_display_name' since='v0.34.01'/>
2834+
<stl-string name='uwss_display_name_sing' since='v0.34.01'/>
2835+
<stl-string name='uwss_display_name_plur' since='v0.34.01'/>
2836+
<stl-string name='uwss_display_name_adj' since='v0.34.01'/>
2837+
2838+
<uint8_t name='uwss_display_tile'/>
2839+
<int8_t name='uwss_display_color_f'/>
2840+
<int8_t name='uwss_display_color_b'/>
2841+
<int8_t name='uwss_display_color_br'/>
2842+
<uint8_t name='uwss_flash_tile'/>
2843+
<int8_t name='uwss_flash_color_f'/>
2844+
<int8_t name='uwss_flash_color_b'/>
2845+
<int8_t name='uwss_flash_color_br'/>
2846+
<uint32_t name='uwss_alt_period' since='v0.34.01'/>
2847+
<uint32_t name='uwss_alt_on_period' since='v0.34.01'/>
2848+
2849+
<stl-vector name='uwss_body_modifier' type-name='int32_t'
2850+
index-refers-to='$$._global.caste.ref-target.body_appearance_modifiers[$]'/>
2851+
<stl-vector name='uwss_bp_modifer' type-name='int32_t' since='v0.34.01' comment='guess!'
2852+
index-refers-to='$$._global.caste.ref-target.bp_appearance.modifier_idx[$].refers-to'/>
2853+
2854+
<uint32_t name='uwss_speed_add' since='v0.34.01'/>
2855+
<uint32_t name='uwss_speed_perc' since='v0.34.01' init-value='100'/>
2856+
2857+
<pointer name='uwss_att_change' type-name='curse_attr_change' since='v0.34.01'/>
2858+
<uint32_t name='uwss_skill_role_adjust' since='v0.34.01' init-value='100'/>
2859+
<int32_t name='uwss_erratic_level' since='v0.42.01'/>
2860+
2861+
<compound name='usable_interaction' type-name='unit_usable_interactionst'/>
28642862

28652863
<compound name='counters2'> not a compound
28662864
<uint32_t name='paralysis'/>

0 commit comments

Comments
 (0)