Skip to content

Commit

Permalink
Merge branch 'master' into adv-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
myk002 committed Aug 10, 2024
2 parents bce0053 + 6b51e34 commit 6a6d403
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions df.buildings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@
<stl-vector name='specific_refs' pointer-type='specific_ref'/>
<stl-vector name='general_refs' pointer-type='general_ref'/>

<stl-vector name='relations' pointer-type='building_civzonest' comment='zone(s) this building is in'/>
<stl-vector name='relations' pointer-type='building_civzonest' comment='zone(s) this building is in; **not sorted**'/>

<stl-vector name='job_claim_suppress' comment='after Remv Cre, prevents unit from taking jobs at building'>
<pointer> bay12: job_restrictionst
Expand Down Expand Up @@ -745,7 +745,7 @@
</compound>

<stl-vector name='home_general_hf' type-name='int32_t' ref-target='historical_figure'/>
<stl-vector name='contained_buildings' pointer-type='building' comment='includes eg workshops and beds'/>
<stl-vector name='contained_buildings' pointer-type='building' comment='includes eg workshops and beds; **not sorted**'/>
<int32_t name='assigned_unit_id' ref-target='unit'/>
<pointer name='assigned_unit' type-name='unit'/>
<stl-vector name='squad_room_info'>
Expand Down

0 comments on commit 6a6d403

Please sign in to comment.