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

misc updates #652

Merged
merged 2 commits into from
Sep 8, 2023
Merged

misc updates #652

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2965f86
misc updates
ab9rf Sep 7, 2023
3d7c739
remove two fields from `work_detail`
ab9rf Sep 8, 2023
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
2 changes: 1 addition & 1 deletion df.items.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@
<class-type type-name='item_eggst' inherits-from='item_actual'>
<int16_t name='race' ref-target='creature_raw'/>
<int16_t name='caste' ref-target='caste_raw' aux-value='$$.race'/>
<int32_t name='unk_7c'/>
<int32_t name='rot_timer'/>
<compound name='egg_materials' type-name='material_vec_ref'/>

<bitfield name='egg_flags'>
Expand Down
29 changes: 29 additions & 0 deletions df.pathfinding.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,35 @@
<enum-item name='ClaimSite'/>
<enum-item name='WaitOrder'/>[
</enum-type>

<bitfield-type type-name='pathfinding_flags'>
<flag-bit name='Desperate'/>
<flag-bit name='Reckless'/>
<flag-bit name='BuildingDestroyer1'/>
<flag-bit name='BuildingDestroyer2'/>
<flag-bit name='StuckInBuilding'/>
<flag-bit name='AllowUnrevealed'/>
<flag-bit name='Doors'/>
<flag-bit name='UnkDoor_7'/>
<flag-bit name='CanLearn'/>
<flag-bit name='path_9'/>
<flag-bit name='JumpCliff'/>
<flag-bit name='Air'/>
<flag-bit name='ShallowWater'/>
<flag-bit name='DeepWater'/>
<flag-bit name='Underwater'/>
<flag-bit name='ShallowMagma'/>
<flag-bit name='DeepMagma'/>
<flag-bit name='UnderMagma'/>
<flag-bit name='InWater'/>
<flag-bit name='InMagma'/>
<flag-bit name='WalkLand'/>
<flag-bit name='ImmobileLand'/>
<flag-bit name='ZeroWalkTag'/>
<flag-bit name='path_23'/>
<flag-bit name='Ghostly'/>
</bitfield-type>

</data-definition>

<!--
Expand Down
2 changes: 1 addition & 1 deletion df.units.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1039,7 +1039,7 @@

<stl-vector name='body_part_temperature' pointer-type='temperaturest'/>

<uint32_t name='add_path_flags' comment='pathing flags to OR, set to 0 after move'/>
<bitfield type-name='pathfinding_flags' name='add_path_flags' comment='pathing flags to OR, set to None after move'/>

<bitfield type-name='tile_designation' name='liquid_type'/>
<uint8_t name='liquid_depth'/>
Expand Down