Skip to content

Commit

Permalink
Merge branch 'master' of github.com:DFHack/df-structures
Browse files Browse the repository at this point in the history
  • Loading branch information
@RosaryMala
RosaryMala committed Jul 2, 2014
2 parents 351bf56 + 64efeae commit c66ab33
Show file tree
Hide file tree
Showing 7 changed files with 5,929 additions and 2,945 deletions.
3 changes: 2 additions & 1 deletion df.creature-raws.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -570,14 +570,15 @@
<stl-vector type-name='int16_t' name='specialattack_mat_type' comment='extract injected'/>
<stl-vector type-name='int32_t' name='specialattack_mat_index'/>
<stl-vector type-name='matter_state' name='specialattack_mat_state'/>
<static-array count='4' name='specialattack_temp_mat' comment='parsed during second pass'><stl-vector pointer-type='stl-string'/></static-array>
<static-array count='3' name='specialattack_temp_mat' comment='parsed during second pass'><stl-vector pointer-type='stl-string'/></static-array>
<stl-vector type-name='int32_t' name='specialattack_min' comment='amount of extract injected or blood sucked'/>
<stl-vector type-name='int32_t' name='specialattack_max'/>
<int32_t name='contact_perc'/>
<int32_t name='penetration_perc'/>
<stl-vector type-name='int16_t' name='body_part_idx'/>
<stl-vector type-name='int16_t' name='tissue_layer_idx'/>
<enum base-type="int16_t" type-name="job_skill" name="skill"/>
<int32_t name='velocity_modifier'/>
<stl-vector pointer-type='stl-string' name='specialattack_interaction_tmp_name' comment='parsed during second pass'/>
<stl-vector type-name='int32_t' name='specialattack_interaction_id'/>
</struct-type>
Expand Down
100 changes: 50 additions & 50 deletions df.units.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1183,17 +1183,17 @@
<enum-item name='RequestFoodCooldown'/> for hungry patients
<enum-item name='RequestRescueCooldown'/>
<enum-item name='RequestHealthcareCooldown'/>
<enum-item name='GetDrinkCooldown'/>
<enum-item name='GetFoodCooldown'/>
<enum-item name='CleanSelfCooldown'/>
<enum-item name='Migrant'/>

<enum-item name='RoomComplaint'/>
<enum-item name='UnnamedResident' comment='upon reaching zero, resident creature gets named'/>
<enum-item name='RentBedroomCooldown'/>
<enum-item name='ClaimTrinketCooldown'/>
<enum-item name='ClaimClothingCooldown'/>
<enum-item name='WantsDrink'>
<enum-item name='GetDrinkCooldown' comment='auto-decrement'/>
<enum-item name='GetFoodCooldown' comment='auto-decrement'/>
<enum-item name='CleanSelfCooldown' comment='auto-decrement'/>
<enum-item name='Migrant' comment='auto-decrement'/>

<enum-item name='RoomComplaint' comment='auto-decrement'/>
<enum-item name='UnnamedResident' comment='upon reaching zero, resident creature gets named'/> handled manually
<enum-item name='RentBedroomCooldown' comment='auto-decrement'/>
<enum-item name='ClaimTrinketCooldown' comment='auto-decrement'/>
<enum-item name='ClaimClothingCooldown' comment='auto-decrement'/>
<enum-item name='WantsDrink' comment='auto-increment to 403200'>
<item-attr name='tag' value='ALCOHOLIC'/>
</enum-item>
<enum-item name='LikesOutdoors'>
Expand All @@ -1209,66 +1209,66 @@
<enum-item name='OnBreak'>
<item-attr name='tag' value='ON_BREAK'/>
</enum-item>
<enum-item name='PrepareToDie'/>
<enum-item name='PrepareToDie' comment='auto-decrement'/>
<enum-item name='CaveAdapt'>
<item-attr name='tag' value='CAVE_ADAPT'/>
</enum-item>
<enum-item comment='auto-decrement'/>
<enum-item comment='auto-decrement'/>
<enum-item/>
<enum-item/>
<enum-item/>
<enum-item/>
<enum-item comment='auto-decrement'/>

<enum-item name='FollowUnitCooldown' comment='0-20, 200 on failed path'/>
<enum-item/>
<enum-item/>
<enum-item/>
<enum-item name='DangerousTerrainCooldown' comment='created at 200, blocks repath?'/>
<enum-item name='Beaching' comment='triggered by BEACH_FREQUENCY'/>
<enum-item name='IdleAreaCooldown'/>
<enum-item name='FollowUnitCooldown' comment='0-20, 200 on failed path, auto-decrement'/>
<enum-item comment='auto-decrement'/>
<enum-item comment='auto-decrement'/>
<enum-item/>
<enum-item name='DangerousTerrainCooldown' comment='created at 200, blocks repath?, auto-decrement'/>
<enum-item name='Beaching' comment='triggered by BEACH_FREQUENCY, auto-decrement'/>
<enum-item name='IdleAreaCooldown' comment='auto-decrement'/>
<enum-item comment='auto-decrement'/>

<enum-item name='PartiedOut'>
<enum-item name='PartiedOut' comment='auto-decrement'>
<item-attr name='tag' value='PARTIED_OUT'/>
</enum-item>
<enum-item name='DiagnosePatientCooldown' comment='0-2000'/>
<enum-item name='DressWoundCooldown'/>
<enum-item name='CleanPatientCooldown'/>
<enum-item name='SurgeryCooldown'/>
<enum-item name='SutureCooldown'/>
<enum-item name='SetBoneCooldown'/>
<enum-item name='PlaceInTractionCooldown'/>

<enum-item name='ApplyCastCooldown'/>
<enum-item name='ImmobilizeBreakCooldown'/>
<enum-item name='BringCrutchCooldown'/>
<enum-item/>
<enum-item name='MilkCounter'>
<enum-item name='DiagnosePatientCooldown' comment='0-2000, auto-decrement'/>
<enum-item name='DressWoundCooldown' comment='auto-decrement'/>
<enum-item name='CleanPatientCooldown' comment='auto-decrement'/>
<enum-item name='SurgeryCooldown' comment='auto-decrement'/>
<enum-item name='SutureCooldown' comment='auto-decrement'/>
<enum-item name='SetBoneCooldown' comment='auto-decrement'/>
<enum-item name='PlaceInTractionCooldown' comment='auto-decrement'/>

<enum-item name='ApplyCastCooldown' comment='auto-decrement'/>
<enum-item name='ImmobilizeBreakCooldown' comment='auto-decrement'/>
<enum-item name='BringCrutchCooldown' comment='auto-decrement'/>
<enum-item comment='auto-decrement, set military pickup flag upon reaching zero'/>
<enum-item name='MilkCounter' comment='auto-decrement'>
<item-attr name='tag' value='MILK_COUNTER'/>
</enum-item>
<enum-item name='HadDrill'/>
<enum-item name='CompletedDrill'/>
<enum-item name='EggSpent'>
<enum-item name='HadDrill' comment='auto-decrement'/>
<enum-item name='CompletedDrill' comment='auto-decrement'/>
<enum-item name='EggSpent' comment='auto-decrement'>
<item-attr name='tag' value='EGG_SPENT'/>
</enum-item>

<enum-item name='GroundedAnimalAnger'>
<enum-item name='GroundedAnimalAnger' comment='auto-decrement'>
<item-attr name='tag' value='GROUNDED_ANIMAL_ANGER'/>
</enum-item>
<enum-item/>
<enum-item comment='auto-decrement'/>
<enum-item name='TimeSinceSuckedBlood'>
<item-attr name='tag' value='TIME_SINCE_SUCKED_BLOOD'/>
</enum-item>
<enum-item name='DrinkingBlood'>
<enum-item name='DrinkingBlood' comment='auto-decrement'>
<item-attr name='tag' value='DRINKING_BLOOD'/>
</enum-item>
<enum-item/>
<enum-item/>
<enum-item name='RevertWildTimer' comment='one trigger => --training_level'/>
<enum-item/>

<enum-item name='NoPantsAnger'/>
<enum-item name='NoShirtAnger'/>
<enum-item name='NoShoesAnger'/>
<enum-item comment='auto-decrement'/>
<enum-item comment='auto-decrement'/>
<enum-item name='RevertWildTimer' comment='one trigger => --training_level, auto-decrement'/>
<enum-item comment='auto-decrement'/>

<enum-item name='NoPantsAnger' comment='auto-decrement'/>
<enum-item name='NoShirtAnger' comment='auto-decrement'/>
<enum-item name='NoShoesAnger' comment='auto-decrement'/>
</enum-type>

<struct-type type-name='unit_misc_trait'>
Expand Down
Loading

0 comments on commit c66ab33

Please sign in to comment.