Skip to content

Commit

Permalink
Merge branch 'develop' into cao_xing_stuff_fixed
Browse files Browse the repository at this point in the history 
# Conflicts:
#	db/TWaD_validation.xml
#	db/ceo_effect_list_to_effects.xml
#	db/ceo_initial_data_active_ceos.xml
#	db/ceo_initial_data_equipments.xml
#	db/ceo_initial_data_scripted_permissions.xml
#	db/ceo_initial_data_stages.xml
#	db/ceo_initial_data_to_stages.xml
#	db/start_pos_characters.xml
#	db/update_commands.txt
  • Loading branch information
@ZadesSC
ZadesSC committed Aug 19, 2019
2 parents 06a9328 + 771cc85 commit 01f0c65
Show file tree
Hide file tree
Showing 11 changed files with 176 additions and 79 deletions.
20 changes: 10 additions & 10 deletions db/TWaD_validation.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1044,8 +1044,8 @@
<uuid name="ceo_anti_ceo_pairs">bdcd6df7-deb9-4f2d-82dd-4c0731fba771</uuid>
<uuid name="ceo_can_equip_requirements">62515277-d4a4-4c53-ae86-e4af81d93ce4</uuid>
<uuid name="ceo_categories">e118679a-6435-44f1-a752-20656bf1866f</uuid>
<uuid name="ceo_effect_list_to_effects">a353bd96-5652-4059-90b0-9bc9e288d891</uuid>
<uuid name="ceo_effect_lists">92d4b895-ec01-46aa-bd6f-d7e809dcd50b</uuid>
<uuid name="ceo_effect_list_to_effects">b81f3cca-c0a3-4c5e-bae6-cbae83754553</uuid>
<uuid name="ceo_effect_lists">74568904-ed96-43d3-a251-bb6b4fb85d9b</uuid>
<uuid name="ceo_equipment_category_managers">ee421c56-8b00-48a2-b7ab-9c17f3a8b074</uuid>
<uuid name="ceo_equipment_manager_all_possible_ceos">a16aa739-f9c3-48b6-a8c5-6e46cede9707</uuid>
<uuid name="ceo_equipment_manager_campaign_lookups">2bd6794e-b768-4c05-9034-974a5ba717c0</uuid>
Expand All @@ -1059,12 +1059,12 @@
<uuid name="ceo_group_ceos">17b9ebda-b0af-4cdf-b003-c49b22aaaa4b</uuid>
<uuid name="ceo_group_spawners">ecedc4e3-d9b5-40f1-a496-5ac8dbac65ce</uuid>
<uuid name="ceo_groups">22635c7c-0e6f-430e-a3db-02452f864993</uuid>
<uuid name="ceo_initial_data_active_ceos">15ac125c-a9bb-4a74-b625-ebfef2c599a5</uuid>
<uuid name="ceo_initial_data_active_ceos">86e610fa-9c65-4e56-99b1-06945bdaeacd</uuid>
<uuid name="ceo_initial_data_active_spawners">1daab026-eefe-4c71-b79f-c991317775e1</uuid>
<uuid name="ceo_initial_data_equipments">5e0728c5-65f4-4bf6-a8af-1876bebd46d1</uuid>
<uuid name="ceo_initial_data_scripted_permissions">d501e9a3-1444-47a9-af8f-edad8ebc0d14</uuid>
<uuid name="ceo_initial_data_stages">b534601f-f62f-4588-9db2-c07dd2a98726</uuid>
<uuid name="ceo_initial_data_to_stages">995f877c-1d09-4b85-969c-3394d19913ef</uuid>
<uuid name="ceo_initial_data_equipments">628cb2c4-d55b-4c04-ada2-99dd297c697b</uuid>
<uuid name="ceo_initial_data_scripted_permissions">78938d2a-9499-4f9b-9819-9324328acd66</uuid>
<uuid name="ceo_initial_data_stages">5697428d-6bf2-4114-99bc-78ac2c94a034</uuid>
<uuid name="ceo_initial_data_to_stages">cdaa95a5-fee2-49a6-ab94-f9e161fda28b</uuid>
<uuid name="ceo_initial_data_triggers">99f17858-b169-47eb-b6b4-13eb124d69b0</uuid>
<uuid name="ceo_initial_datas">c1007a6f-ae8f-4981-bb9d-d622fad3b839</uuid>
<uuid name="ceo_location_enums">4a269a6f-a5d9-43e7-aebc-d52497da660a</uuid>
Expand Down Expand Up @@ -1696,7 +1696,7 @@
<uuid name="start_pos_character_retinue_unit_modifiers">c020f61f-6e56-4634-ae9a-bdf1fbc70325</uuid>
<uuid name="start_pos_character_retinue_unit_stats_bonuses">9df36d58-8663-4b7b-86a0-08030079e90c</uuid>
<uuid name="start_pos_character_to_settlements">ad890df9-0de4-4241-a115-75351ee0b299</uuid>
<uuid name="start_pos_characters">0a6c2b11-0b0f-4a59-a3f6-2a070d36ae94</uuid>
<uuid name="start_pos_characters">e5e45aa7-e969-4fb2-8a80-0c3ee8e01a51</uuid>
<uuid name="start_pos_diplomacy_complex_deal_component_alliance_oath_parameters">bbfb8780-11ef-4e9b-ac52-4a8f848d78e8</uuid>
<uuid name="start_pos_diplomacy_complex_deal_component_alliance_parameters">f68a439e-805b-4e0f-8c4a-5f41135e801a</uuid>
<uuid name="start_pos_diplomacy_complex_deal_component_deals_parameters">e593107a-f714-47ec-9238-d1be0fc2715d</uuid>
Expand All @@ -1714,14 +1714,14 @@
<uuid name="start_pos_diplomacy_simple_deal_faction_parameters">d4fb8562-26f7-409a-8e6e-cb381be33535</uuid>
<uuid name="start_pos_diplomacy_simple_deal_value_parameters">9a003966-d26e-47c7-b4d7-0880286f42f1</uuid>
<uuid name="start_pos_diplomacy_simple_deals">ffd636f1-5689-4751-8dc2-7a34c21e98af</uuid>
<uuid name="start_pos_factions">b8930571-af8c-4b8a-b931-9aba8f41e288</uuid>
<uuid name="start_pos_factions">b6807d04-7f6b-4a6c-83ee-df41b3ea39fb</uuid>
<uuid name="start_pos_family_relationship_types">095dd7f3-532e-48aa-a250-77c52f1a3f00</uuid>
<uuid name="start_pos_family_relationships">ad066e1f-bfe3-4a24-98da-ac33246745bd</uuid>
<uuid name="start_pos_historical_characters_past_experiences">fe722d90-17fa-40a1-ba4e-b42c40758ee1</uuid>
<uuid name="start_pos_horde_details">fe00fbb3-a0b9-4826-aa5a-b67791b27803</uuid>
<uuid name="start_pos_land_units">ea3a6cb4-79ec-47ed-a88e-5c197c709418</uuid>
<uuid name="start_pos_naval_units">ff0e8689-b0da-4e7a-bc18-fbfdbb488c51</uuid>
<uuid name="start_pos_non_commanding_generals">5573d132-b2a0-4709-b084-42b097cb7fb0</uuid>
<uuid name="start_pos_non_commanding_generals">0ef3eddc-a0a1-4543-bde7-7ee16224b775</uuid>
<uuid name="start_pos_past_events">34b9a905-e07e-408c-bcf0-6e8cdd205bbe</uuid>
<uuid name="start_pos_region_pooled_resources">513bb94e-abc2-4fbb-ac0d-1a1d601b97c3</uuid>
<uuid name="start_pos_region_religions">14488197-b80e-4b11-9703-757502baf787</uuid>
Expand Down
10 changes: 5 additions & 5 deletions db/ceo_effect_list_to_effects.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<dataroot xmlns:od="urn:schemas-microsoft-com:officedata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ceo_effect_list_to_effects.xsd" export_time="Sun Aug 18 15:39:24 2019" revision="265" export_branch="D:/Steam/steamapps/common/Total War THREE KINGDOMS/assembly_kit/binaries" export_user="assembly.kit">
<edit_uuid>a353bd96-5652-4059-90b0-9bc9e288d891</edit_uuid>
<dataroot xmlns:od="urn:schemas-microsoft-com:officedata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ceo_effect_list_to_effects.xsd" export_time="Sun Aug 18 08:06:16 2019" revision="262" export_branch="C:/Program Files (x86)/Steam/steamapps/common/Total War THREE KINGDOMS/assembly_kit/binaries" export_user="assembly.kit">
<edit_uuid>b81f3cca-c0a3-4c5e-bae6-cbae83754553</edit_uuid>
<ceo_effect_list_to_effects record_uuid="{3d33b248-5636-4bc9-b358-1937e08f30dd}" record_timestamp="1549445268729" record_key="1000426288">
<auto_id>1000426288</auto_id>
<effect>3k_main_effect_ai_hint_general</effect>
Expand Down Expand Up @@ -23201,13 +23201,13 @@
<optional_only_in_game_mode></optional_only_in_game_mode>
<value>6</value>
</ceo_effect_list_to_effects>
<ceo_effect_list_to_effects record_uuid="{e84e3057-e737-4725-87d1-892517f41912}" record_timestamp="1566051384814" record_key="286316681">
<ceo_effect_list_to_effects record_uuid="{e84e3057-e737-4725-87d1-892517f41912}" record_timestamp="1566133576496" record_key="286316681">
<auto_id>286316681</auto_id>
<effect>3k_main_effect_unit_stats_charge_bonus_abs_fire_units</effect>
<effect>3k_main_skill_fire_charge_bonus</effect>
<effect_list>3k_main_ceo_node_career_historical_gao_shun_01</effect_list>
<effect_scope>character_to_military_force_retinue_own</effect_scope>
<optional_only_in_game_mode></optional_only_in_game_mode>
<value>10</value>
<value>15</value>
</ceo_effect_list_to_effects>
<ceo_effect_list_to_effects record_uuid="{530fc958-6447-4cb0-8e50-2d2f0044019e}" record_timestamp="1548782454464" record_key="286387840">
<auto_id>286387840</auto_id>
Expand Down
Loading

0 comments on commit 01f0c65

Please sign in to comment.