Skip to content

Commit

Permalink
Merge pull request DFHack#343 from sedb-dfh/master
Browse files Browse the repository at this point in the history 
Initial pass at historical events from 0.47
  • Loading branch information
@BenLubar
BenLubar authored Feb 10, 2020
2 parents 233e944 + 6b1f701 commit a63938c
Show file tree
Hide file tree
Showing 2 changed files with 236 additions and 4 deletions.
232 changes: 228 additions & 4 deletions df.history.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -798,6 +798,28 @@
<enum-item name='SQUAD_VS_SQUAD'/>
<enum-item name='SITE_SURRENDERED'/>
<enum-item name='ENTITY_EXPELS_HF'/>

<enum-item name='TRADE' since='v0.47.01'/>
<enum-item name='ADD_ENTITY_SITE_PROFILE_FLAG' since='v0.47.01'/>
<enum-item name='GAMBLE' since='v0.47.01'/>
<enum-item name='ADD_HF_ENTITY_HONOR' since='v0.47.01'/>
<enum-item name='ENTITY_DISSOLVED' since='v0.47.01'/>
<enum-item name='ENTITY_EQUIPMENT_PURCHASE' since='v0.47.01'/>
<enum-item name='MODIFIED_BUILDING' since='v0.47.01'/>
<enum-item name='BUILDING_PROFILE_ACQUIRED' since='v0.47.01'/>
<enum-item name='HF_PREACH' since='v0.47.01'/>
<enum-item name='ENTITY_PERSECUTED' since='v0.47.01'/>
<enum-item name='ENTITY_BREACH_FEATURE_LAYER' since='v0.47.01'/>
<enum-item name='ENTITY_ALLIANCE_FORMED' since='v0.47.01'/>
<enum-item name='HF_RANSOMED' since='v0.47.01'/>
<enum-item name='HF_ENSLAVED' since='v0.47.01'/>
<enum-item name='SABOTAGE' since='v0.47.01'/>
<enum-item name='ENTITY_OVERTHROWN' since='v0.47.01'/>
<enum-item name='HFS_FORMED_INTRIGUE_RELATIONSHIP' since='v0.47.01'/>
<enum-item name='FAILED_INTRIGUE_CORRUPTION' since='v0.47.01'/>
<enum-item name='HF_CONVICTED' since='v0.47.01'/>
<enum-item name='FAILED_FRAME_ATTEMPT' since='v0.47.01'/>
<enum-item name='HF_INTERROGATED' since='v0.47.01'/>
</enum-type>

<enum-type type-name='history_event_reason'>
Expand Down Expand Up @@ -2207,6 +2229,208 @@
<int32_t name='feature_layer' ref-target='world_underground_region'/>
</class-type>

<class-type type-name='history_event_tradest' inherits-from='history_event' since='v0.47.01'>
<int32_t name='hf' ref-target='historical_figure'/>
<int32_t name='entity' ref-target='historical_entity' comment='the guild to which the figure belongs?'/>
<int32_t name='source_site' ref-target='world_site'/>
<int32_t name='dest_site' ref-target='world_site'/>
<int32_t/>
<int32_t/>
<int32_t/>
<int32_t comment='value of the trade?'/>
</class-type>

<class-type type-name='history_event_add_entity_site_profile_flagst' inherits-from='history_event' since='v0.47.01'>
<int32_t name='entity' ref-target='historical_entity'/>
<int32_t name='site' ref-target='world_site'/>
</class-type>

<class-type type-name='history_event_add_hf_entity_honorst' inherits-from='history_event' since='v0.47.01'>
<int32_t name='entity' ref-target='historical_entity'/>
<int32_t name='hf' ref-target='historical_figure'/>
<int32_t comment='index or identifier for the honor?'/>
</class-type>

<class-type type-name='history_event_gamblest' inherits-from='history_event' since='v0.47.01'>
<int32_t name='hf' ref-target='historical_figure'/>
<int32_t name='site' ref-target='world_site'/>
<int32_t name='structure'/>
<int32_t name='money_before'/>
<int32_t name='money_after'/>
</class-type>

<class-type type-name='history_event_entity_dissolvedst' inherits-from='history_event' since='v0.47.01'>
<int32_t name='entity' ref-target='historical_entity'/>
<int32_t/>
<int32_t/>
<int32_t name='reason' comment='89: due to lack of funds, 90: after taking heavy losses in battle'/> probably new values for history_event_reason
<int32_t/>
</class-type>

<class-type type-name='history_event_entity_equipment_purchasest' inherits-from='history_event' since='v0.47.01'>
<int32_t name='entity' ref-target='historical_entity'/>
<int32_t name='quality' comment='1 = well-crafted, 2 = finely-crafted, 3 = superior, 4 = exceptional, 5 = masterwork'/>
<stl-vector name='hfs' type-name='int32_t' ref-target='historical_figure'/>
<int32_t/>
<int32_t/>
</class-type>

<class-type type-name='history_event_modified_buildingst' inherits-from='history_event' since='v0.47.01'>
<int32_t name='site' ref-target='world_site'/>
<int32_t name='structure'/>
<int32_t name='hf' ref-target='historical_figure'/>
<int32_t/> always 12? maybe a reason? history_event_reason::great_fortresses_built_and_tested
<bitfield name='extension_type' base-type='uint32_t'>
<flag-bit name='dungeon'/>
<flag-bit name='fortifications'/>
<flag-bit name='courtyard'/>
<flag-bit name='feast_hall'/>
</bitfield>
</class-type>

<class-type type-name='history_event_building_profile_acquiredst' inherits-from='history_event' since='v0.47.01'>
<int32_t name='site' ref-target='world_site'/>
<int32_t name='structure'/>
<int32_t name='hf' ref-target='historical_figure'/>
<int32_t name='entity' ref-target='historical_entity'/>
<int32_t name='inherited' comment='0: purchased, 1: inherited'/>
<int32_t name='previous_owner_hf' ref-target='historical_figure'/>
</class-type>

<class-type type-name='history_event_hf_preachst' inherits-from='history_event' since='v0.47.01'>
<int32_t name='hf' ref-target='historical_figure'/>
<int32_t name='site' ref-target='world_site'/>
<int16_t name='content' comment='11 = inveighing against, 12 = urging love be shown'/>
<int32_t name='preached_to_entity' ref-target='historical_entity'/>
<int32_t name='against_entity' ref-target='historical_entity'/>
<int32_t/>
</class-type>

<class-type type-name='history_event_entity_persecutedst' inherits-from='history_event' since='v0.47.01'>
<int32_t name='persecuting_hf' ref-target='historical_figure'/>
<int32_t name='persecuting_entity' ref-target='historical_entity'/>
<int32_t name='target_entity' ref-target='historical_entity'/>
<int32_t name='site' ref-target='world_site'/>
<stl-vector type-name='int32_t' ref-target='historical_figure' comment='subset of expelled_hfs. expelled priests?'/>
<stl-vector type-name='int32_t'/>
<int32_t/>
<stl-vector name='expelled_hfs' type-name='int32_t' ref-target='historical_figure'/>
<stl-vector type-name='int32_t'/>
<stl-vector name='expelled_races' type-name='int32_t'/>
<stl-vector name='expelled_counts' type-name='int32_t'/>
</class-type>

<class-type type-name='history_event_entity_breach_feature_layerst' inherits-from='history_event' since='v0.47.01'>
<int32_t name='site' ref-target='world_site'/>
<int32_t name='governing_entity' ref-target='historical_entity'/>
<int32_t name='civ_entity' ref-target='historical_entity'/>
<int32_t name='layer' ref-target='world_underground_region'/>
</class-type>

<class-type type-name='history_event_entity_alliance_formedst' inherits-from='history_event' since='v0.47.01'>
<int32_t name='entity' ref-target='historical_entity'/>
<int32_t/>
<stl-vector name='allied_entities' type-name='int32_t' ref-target='historical_entity'/>
<int32_t/>
<int32_t/>
</class-type>

<class-type type-name='history_event_hf_ransomedst' inherits-from='history_event' since='v0.47.01'>
<int32_t name='hf' ref-target='historical_figure'/>
<int32_t name='ransomer_hf' ref-target='historical_figure'/>
<int32_t name='paying_hf' ref-target='historical_figure'/>
<int32_t name='paying_entity' ref-target='historical_entity'/>
<int32_t name='site' ref-target='world_site'/>
</class-type>

<class-type type-name='history_event_hf_enslavedst' inherits-from='history_event' since='v0.47.01'>
<int32_t name='hf' ref-target='historical_figure'/>
<int32_t name='selling_hf' ref-target='historical_figure'/>
<int32_t name='buying_entity' ref-target='historical_entity'/>
<int32_t name='site' ref-target='world_site'/>
</class-type>

<class-type type-name='history_event_sabotagest' inherits-from='history_event' since='v0.47.01'>
Have not yet found this event in-game. Possibly not used yet?
</class-type>

<class-type type-name='history_event_entity_overthrownst' inherits-from='history_event' since='v0.47.01'>
<int32_t name='toppled_hf' ref-target='historical_figure'/>
<int32_t name='hf' ref-target='historical_figure'/>
<int32_t name='master_villain_hf' ref-target='historical_figure'/>
<int32_t name='governing_entity' ref-target='historical_entity'/>
<int32_t/> 0 or 1?
<int32_t/>
<stl-vector name='supporters' type-name='int32_t' ref-target='historical_figure'/>
<int32_t name='site' ref-target='world_site'/>
</class-type>

<class-type type-name='history_event_hfs_formed_intrigue_relationshipst' inherits-from='history_event' since='v0.47.01'>
<int32_t name='villain_hf' ref-target='historical_figure'/>
<int32_t name='villain_identity'/>
<int32_t name='target_hf' ref-target='historical_figure'/>
<int32_t name='target_identity'/>
<int32_t/> ? 6 = plots and schemes, 11 = agent
<int32_t/> ? 4 = plots and schemes, 21 = agent
<int32_t name='site' ref-target='world_site'/>
</class-type>

<class-type type-name='history_event_failed_intrigue_corruptionst' inherits-from='history_event' since='v0.47.01'>
<int32_t name='villain_hf' ref-target='historical_figure'/>
<int32_t name='villain_identity'/>
<int32_t name='target_hf' ref-target='historical_figure'/>
<int32_t name='target_identity'/>
<int32_t name='site' ref-target='world_site'/>
</class-type>

<class-type type-name='history_event_hf_convictedst' inherits-from='history_event' since='v0.47.01'>
<int32_t name='hf' ref-target='historical_figure'/>
<int32_t name='entity' ref-target='historical_entity'/>
<int32_t name='recognized_by_entity' ref-target='historical_entity'/>
<int32_t name='recognized_by_hf' ref-target='historical_figure'/>
<stl-vector name='implicated' type-name='int32_t' ref-target='historical_figure'/>
<int32_t name='corrupt_hf' ref-target='historical_figure'/>
<int32_t name='behest_of_hf' ref-target='historical_figure'/>
<int32_t name='fooled_hf' ref-target='historical_figure'/>
<int32_t name='fooling_hf' ref-target='historical_figure'/>
<int32_t name='surveillance_hf' ref-target='historical_figure'/>
<int32_t name='co_conspirator_hf' ref-target='historical_figure'/>
<int32_t name='target_hf' ref-target='historical_figure'/>
<int32_t name="crime" comment='references crime::T_mode'/>
<int32_t/>
<int32_t name='months_sentence'/>
<bitfield name='punishment_flags' base-type='uint32_t'>
<flag-bit name='beaten'/>
<flag-bit name='exiled'/>
<flag-bit name='death_sentence' comment='sentenced to death'/>
<flag-bit name='no_prison_available' comment='would have been imprisoned but for lack of accommodations'/>
</bitfield>
<bitfield name='plot_flags' base-type='uint32_t'>
<flag-bit name='wrongful' comment='wrongful conviction'/>
<flag-bit name='plot_surveillance' comment='due to ongoing surveillance as the plot unfolded'/>
<flag-bit name='target_surveillance' comment='due to ongoing surveillance on the target'/>
<flag-bit name='implicated_others' comment='implicated others during interrogation'/>
<flag-bit name='co_conspirator_surveillance' comment='due to ongoing surveillance on a coconspirator'/>
<flag-bit name='go_between' comment='convicted as go-between'/>
<flag-bit name='revealed_nothing' comment='revealed nothing during interrogation'/>
</bitfield>
</class-type>

<class-type type-name='history_event_failed_frame_attemptst' inherits-from='history_event' since='v0.47.01'>
<int32_t name='target_hf' ref-target='historical_figure'/>
<int32_t name='fooled_entity' ref-target='historical_entity'/>
<int32_t name='master_villain_hf' ref-target='historical_figure'/>
<int32_t name='fooled_hf' ref-target='historical_figure'/>
<int32_t name='villain_hf' ref-target='historical_figure'/>
<int32_t name='crime' comment='references crime::T_mode'/>
</class-type>

<class-type type-name='history_event_hf_interrogatedst' inherits-from='history_event' since='v0.47.01'>
<int32_t name='hf' ref-target='historical_figure'/>
<int32_t name='arresting_entity' ref-target='historical_entity'/>
<int32_t name='interrogator_hf' ref-target='historical_figure'/>
</class-type>

<enum-type type-name='history_event_collection_type'>
<enum-item name='WAR'/>
<enum-item name='BATTLE'/>
Expand Down Expand Up @@ -2464,14 +2688,14 @@
</class-type>

<class-type type-name='history_event_collection_persecutionst' inherits-from='history_event_collection' since='v0.47.01'>
<int32_t name='site_id' ref-target='world_site'/>
<int32_t name='target_entity_id' ref-target='historical_entity'/>
<int32_t name='site' ref-target='world_site'/>
<int32_t name='entity' ref-target='historical_entity'/>
<int32_t name='ordinal'/>
</class-type>

<class-type type-name='history_event_collection_entity_overthrownst' inherits-from='history_event_collection' since='v0.47.01'>
<int32_t name='site_id' ref-target='world_site'/>
<int32_t name='target_entity_id' ref-target='historical_entity'/>
<int32_t name='site' ref-target='world_site'/>
<int32_t name='entity' ref-target='historical_entity'/>
<int32_t name='ordinal'/>
</class-type>

Expand Down
8 changes: 8 additions & 0 deletions df.world.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,14 @@
<enum-item name='Theft'/>
<enum-item name='Robbery'/>
<enum-item name='BloodDrinking'/>
<enum-item name='Embezzlement' since='v0.47.01'/>
<enum-item name='AttemptedMurder' since='v0.47.01'/>
<enum-item name='Kidnapping' since='v0.47.01'/>
<enum-item name='AttemptedKidnapping' since='v0.47.01'/>
<enum-item name='AttemptedTheft' since='v0.47.01'/>
<enum-item name='Treason' since='v0.47.01'/>
<enum-item name='Espionage' since='v0.47.01'/>
<enum-item name='Bribery' since='v0.47.01'/>
</enum>

<compound name='punishment'>
Expand Down

0 comments on commit a63938c

Please sign in to comment.