Skip to content

Commit

Permalink
Renamed events and classes based on the values from symbols.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
@sedb-dfh
sedb-dfh committed Feb 7, 2020
1 parent d0dacea commit e3a6323
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 51 deletions.
90 changes: 47 additions & 43 deletions df.history.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -792,27 +792,27 @@
<enum-item name='SITE_SURRENDERED'/>
<enum-item name='ENTITY_EXPELS_HF'/>

<enum-item name='HF_TRADED'/>
<enum-item name='ENTITY_HOLY_CITY'/>
<enum-item name='HF_GAMBLED'/>
<enum-item name='HF_GAINED_TITLE'/>
<enum-item name='ENTITY_DISSOLVED'/>
<enum-item name='ENTITY_PURCHASED_EQUIPMENT'/>
<enum-item name='HOUSE_EXTENDED'/>
<enum-item name='HOUSE_ACQUIRED'/>
<enum-item name='HF_PREACHED'/>
<enum-item name='RELIGIOUS_PERSECUTION'/>
<enum-item name='UNDERWORLD_BREACHED'/>
<enum-item name='ENTITY_ALLIANCE'/>
<enum-item name='HF_RANSOMED'/>
<enum-item name='HF_SOLD'/>
<enum-item name='UNKNOWN_127'/>
<enum-item name='HF_LED_COUP'/>
<enum-item name='HF_SUCCESSFUL_CORRUPTION'/>
<enum-item name='HF_FAILED_CORRUPTION'/>
<enum-item name='HF_CONVICTED'/>
<enum-item name='HF_FRAMED'/>
<enum-item name='HF_INTERROGATED'/>
<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 @@ -2222,7 +2222,7 @@
<int32_t name='feature_layer' ref-target='world_underground_region'/>
</class-type>

<class-type type-name='history_event_hf_tradedst' inherits-from='history_event'>
<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'/>
Expand All @@ -2233,40 +2233,40 @@
<int32_t comment='value of the trade?'/>
</class-type>

<class-type type-name='history_event_entity_holy_sitest' inherits-from='history_event'>
<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_hf_gained_titlest' inherits-from='history_event'>
<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 title?'/>
<int32_t comment='index or identifier for the honor?'/>
</class-type>

<class-type type-name='history_event_hf_gambledst' inherits-from='history_event'>
<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'>
<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_purchased_equipmentst' inherits-from='history_event'>
<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'/>
</class-type>

<class-type type-name='history_event_house_extendedst' inherits-from='history_event'>
<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'/>
Expand All @@ -2279,7 +2279,7 @@
</bitfield>
</class-type>

<class-type type-name='history_event_house_acquiredst' inherits-from='history_event'>
<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'/>
Expand All @@ -2288,15 +2288,15 @@
<int32_t name='previous_owner_hf' ref-target='historical_figure'/>
</class-type>

<class-type type-name='history_event_hf_preachedst' inherits-from='history_event'>
<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'/>
</class-type>

<class-type type-name='history_event_religious_persecutionst' inherits-from='history_event'>
<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'/>
Expand All @@ -2310,35 +2310,39 @@
<stl-vector name='expelled_counts' type-name='int32_t'/>
</class-type>

<class-type type-name='history_event_underworld_breachedst' inherits-from='history_event'>
<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='underworld_region' ref-target='world_underground_region'/>
<int32_t name='layer' ref-target='world_underground_region'/>
</class-type>

<class-type type-name='history_event_entity_alliancest' inherits-from='history_event'>
<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'/>
</class-type>

<class-type type-name='history_event_hf_ransomedst' inherits-from='history_event'>
<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_soldst' inherits-from='history_event'>
<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_hf_led_coupst' inherits-from='history_event'>
<class-type type-name='history_event_sabotagest' inherits-from='history_event' since='v0.47.01'>
Have not yet found this event in-game
</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'/>
Expand All @@ -2349,7 +2353,7 @@
<int32_t name='site' ref-target='world_site'/>
</class-type>

<class-type type-name='history_event_hf_successful_corruptionst' inherits-from='history_event'>
<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'/>
Expand All @@ -2359,15 +2363,15 @@
<int32_t name='site' ref-target='world_site'/>
</class-type>

<class-type type-name='history_event_hf_failed_corruptionst' inherits-from='history_event'>
<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'>
<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'/>
Expand Down Expand Up @@ -2400,7 +2404,7 @@
</bitfield>
</class-type>

<class-type type-name='history_event_hf_framedst' inherits-from='history_event'>
<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'/>
Expand All @@ -2409,7 +2413,7 @@
<int32_t name='crime' comment='references crime::T_mode'/>
</class-type>

<class-type type-name='history_event_hf_interrogatedst' inherits-from='history_event'>
<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'/>
Expand Down
16 changes: 8 additions & 8 deletions df.world.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,14 @@
<enum-item name='Theft'/>
<enum-item name='Robbery'/>
<enum-item name='BloodDrinking'/>
<enum-item name='Embezzlement'/>
<enum-item name='AttemptedMurder'/>
<enum-item name='Kidnapping'/>
<enum-item name='AttemptedKidnapping'/>
<enum-item name='AttemptedTheft'/>
<enum-item name='Treason'/>
<enum-item name='Espionage'/>
<enum-item name='Bribery'/>
<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 e3a6323

Please sign in to comment.