diff --git a/db/TWaD_validation.xml b/db/TWaD_validation.xml
index 33e0af4..c336d75 100644
--- a/db/TWaD_validation.xml
+++ b/db/TWaD_validation.xml
@@ -1044,8 +1044,8 @@
bdcd6df7-deb9-4f2d-82dd-4c0731fba771
62515277-d4a4-4c53-ae86-e4af81d93ce4
e118679a-6435-44f1-a752-20656bf1866f
-a353bd96-5652-4059-90b0-9bc9e288d891
-92d4b895-ec01-46aa-bd6f-d7e809dcd50b
+b81f3cca-c0a3-4c5e-bae6-cbae83754553
+74568904-ed96-43d3-a251-bb6b4fb85d9b
ee421c56-8b00-48a2-b7ab-9c17f3a8b074
a16aa739-f9c3-48b6-a8c5-6e46cede9707
2bd6794e-b768-4c05-9034-974a5ba717c0
@@ -1059,12 +1059,12 @@
17b9ebda-b0af-4cdf-b003-c49b22aaaa4b
ecedc4e3-d9b5-40f1-a496-5ac8dbac65ce
22635c7c-0e6f-430e-a3db-02452f864993
-15ac125c-a9bb-4a74-b625-ebfef2c599a5
+86e610fa-9c65-4e56-99b1-06945bdaeacd
1daab026-eefe-4c71-b79f-c991317775e1
-5e0728c5-65f4-4bf6-a8af-1876bebd46d1
-d501e9a3-1444-47a9-af8f-edad8ebc0d14
-b534601f-f62f-4588-9db2-c07dd2a98726
-995f877c-1d09-4b85-969c-3394d19913ef
+628cb2c4-d55b-4c04-ada2-99dd297c697b
+78938d2a-9499-4f9b-9819-9324328acd66
+5697428d-6bf2-4114-99bc-78ac2c94a034
+cdaa95a5-fee2-49a6-ab94-f9e161fda28b
99f17858-b169-47eb-b6b4-13eb124d69b0
c1007a6f-ae8f-4981-bb9d-d622fad3b839
4a269a6f-a5d9-43e7-aebc-d52497da660a
@@ -1696,7 +1696,7 @@
c020f61f-6e56-4634-ae9a-bdf1fbc70325
9df36d58-8663-4b7b-86a0-08030079e90c
ad890df9-0de4-4241-a115-75351ee0b299
-0a6c2b11-0b0f-4a59-a3f6-2a070d36ae94
+e5e45aa7-e969-4fb2-8a80-0c3ee8e01a51
bbfb8780-11ef-4e9b-ac52-4a8f848d78e8
f68a439e-805b-4e0f-8c4a-5f41135e801a
e593107a-f714-47ec-9238-d1be0fc2715d
@@ -1714,14 +1714,14 @@
d4fb8562-26f7-409a-8e6e-cb381be33535
9a003966-d26e-47c7-b4d7-0880286f42f1
ffd636f1-5689-4751-8dc2-7a34c21e98af
-b8930571-af8c-4b8a-b931-9aba8f41e288
+b6807d04-7f6b-4a6c-83ee-df41b3ea39fb
095dd7f3-532e-48aa-a250-77c52f1a3f00
ad066e1f-bfe3-4a24-98da-ac33246745bd
fe722d90-17fa-40a1-ba4e-b42c40758ee1
fe00fbb3-a0b9-4826-aa5a-b67791b27803
ea3a6cb4-79ec-47ed-a88e-5c197c709418
ff0e8689-b0da-4e7a-bc18-fbfdbb488c51
-5573d132-b2a0-4709-b084-42b097cb7fb0
+0ef3eddc-a0a1-4543-bde7-7ee16224b775
34b9a905-e07e-408c-bcf0-6e8cdd205bbe
513bb94e-abc2-4fbb-ac0d-1a1d601b97c3
14488197-b80e-4b11-9703-757502baf787
diff --git a/db/ceo_effect_list_to_effects.xml b/db/ceo_effect_list_to_effects.xml
index 49d8095..165bcf8 100644
--- a/db/ceo_effect_list_to_effects.xml
+++ b/db/ceo_effect_list_to_effects.xml
@@ -1,6 +1,6 @@
-
-a353bd96-5652-4059-90b0-9bc9e288d891
+
+b81f3cca-c0a3-4c5e-bae6-cbae83754553
1000426288
3k_main_effect_ai_hint_general
@@ -23201,13 +23201,13 @@
6
-
+
286316681
-3k_main_effect_unit_stats_charge_bonus_abs_fire_units
+3k_main_skill_fire_charge_bonus
3k_main_ceo_node_career_historical_gao_shun_01
character_to_military_force_retinue_own
-10
+15
286387840
diff --git a/db/ceo_initial_data_active_ceos.xml b/db/ceo_initial_data_active_ceos.xml
index 7a5529a..99ebe76 100644
--- a/db/ceo_initial_data_active_ceos.xml
+++ b/db/ceo_initial_data_active_ceos.xml
@@ -1,6 +1,6 @@
-
-15ac125c-a9bb-4a74-b625-ebfef2c599a5
+
+86e610fa-9c65-4e56-99b1-06945bdaeacd
3k_main_ceo_career_historical_liu_zhang
100223486
@@ -85,6 +85,12 @@
3k_ytr_ceo_initial_data_character_historical_huang_shao_ancillaries
0
+
+3k_main_ancillary_weapon_hook_sickle_sabre_common
+1011784587
+3k_main_ceo_initial_data_character_historical_gao_shun_ancillaries
+0
+
3k_main_ceo_class_fire
1011832326
@@ -655,8 +661,8 @@
3k_main_ceo_initial_data_stage_character_traits_historical_ma_chao
0
-
-3k_main_ancillary_armour_strategist_light_armour_water_refined
+
+3k_custom_ancillary_armour_water
1090869106
3k_main_ceo_initial_data_character_historical_guo_jia_ancillaries
0
@@ -2017,8 +2023,8 @@
3k_main_ceo_initial_data_character_historical_guo_jia_ancillaries
0
-
-3k_main_ancillary_armour_light_armour_earth_metal_and_water_refined
+
+3k_custom_ancillary_armour_metal
12686828
3k_main_ceo_initial_data_character_historical_cheng_pu_ancillaries
0
@@ -2647,8 +2653,8 @@
3k_main_ceo_initial_data_stage_character_traits_historical_xun_you
0
-
-3k_main_ancillary_armour_strategist_light_armour_water_common
+
+3k_custom_ancillary_armour_water
135722120
3k_main_ceo_initial_data_character_historical_lu_su_ancillaries
0
@@ -2791,12 +2797,6 @@
3k_main_ceo_initial_data_stage_character_traits_historical_lady_bao_sanniang
0
-
-3k_main_ancillary_armour_light_armour_earth_metal_and_water_common
-1380370702
-3k_main_ceo_initial_data_character_historical_cheng_pu_ancillaries
-0
-
3k_main_ancillary_weapon_single_edged_sword_common
1381836516
@@ -6313,6 +6313,12 @@
3k_ytr_ceo_initial_data_stage_character_traits_historical_zhang_kai
0
+
+3k_main_ancillary_weapon_two_handed_axe_common
+1884025868
+3k_main_ceo_initial_data_character_historical_gao_shun_ancillaries
+0
+
3k_main_ancillary_weapon_dual_swords_common
1885132334
@@ -6769,7 +6775,7 @@
3k_main_ceo_initial_data_stage_character_traits_historical_ma_teng
0
-
+
3k_main_ceo_class_metal
1950996298
3k_main_ceo_initial_data_stage_character_traits_historical_cao_xing
@@ -7399,8 +7405,8 @@
3k_main_ceo_initial_data_stage_character_traits_historical_zhang_zhao
0
-
-3k_main_ancillary_armour_medium_armour_metal_extraordinary
+
+3k_custom_ancillary_armour_metal
2030666637
3k_main_ceo_initial_data_character_historical_lu_meng_ancillaries
0
@@ -7561,6 +7567,12 @@
3k_main_ceo_initial_data_character_historical_lady_sun_ancillaries
0
+
+3k_main_ancillary_mount_red_horse
+2059437828
+3k_main_ceo_initial_data_character_historical_gao_shun_ancillaries
+0
+
3k_main_ancillary_armour_strategist_light_armour_water_common
2060453804
@@ -8077,6 +8089,12 @@
3k_main_ceo_initial_data_stage_character_traits_historical_zhuge_dan
0
+
+3k_main_ancillary_weapon_halberd_common
+2122059397
+3k_main_ceo_initial_data_character_historical_gao_shun_ancillaries
+0
+
3k_ytr_ceo_equipment_permissions_armour_metal
2122555731
@@ -8899,8 +8917,8 @@
3k_main_ceo_initial_data_character_historical_yan_liang_ancillaries
0
-
-3k_main_ancillary_armour_strategist_light_armour_water_common
+
+3k_custom_ancillary_armour_water
310821489
3k_main_ceo_initial_data_character_historical_lu_xun_ancillaries
0
@@ -10687,12 +10705,6 @@
ep_ceo_initial_data_character_historical_sima_wei_ancillaries
0
-
-3k_main_ancillary_armour_strategist_light_armour_water_common
-550029415
-3k_main_ceo_initial_data_character_historical_guo_jia_ancillaries
-0
-
3k_main_ancillary_armour_light_armour_earth_metal_and_water_common
550256580
@@ -11917,8 +11929,8 @@
3k_main_ceo_initial_data_character_historical_xun_you_ancillaries
0
-
-3k_main_ancillary_armour_medium_armour_earth_and_metal_common
+
+3k_custom_ancillary_armour_metal
738262954
3k_main_ceo_initial_data_character_historical_cheng_pu_ancillaries
0
@@ -12091,6 +12103,12 @@
3k_main_ceo_initial_data_stage_character_traits_historical_cao_ang
0
+
+3k_custom_ancillary_armour_fire
+765616481
+3k_main_ceo_initial_data_character_historical_gao_shun_ancillaries
+0
+
3k_main_ancillary_armour_heavy_armour_wood_and_fire_common
767526404
@@ -12637,8 +12655,8 @@
3k_main_ceo_initial_data_character_generic_wood_ancillaries_01
0
-
-3k_main_ancillary_armour_strategist_light_armour_water_extraordinary
+
+3k_custom_ancillary_armour_water
837457976
3k_main_ceo_initial_data_character_historical_lu_xun_ancillaries
0
@@ -12709,6 +12727,12 @@
3k_main_ceo_initial_data_character_historical_cai_mao_ancillaries
0
+
+3k_main_ancillary_weapon_two_handed_spear_common
+845528983
+3k_main_ceo_initial_data_character_historical_gao_shun_ancillaries
+0
+
3k_main_ceo_trait_personality_humble
845972144
@@ -12883,8 +12907,8 @@
ep_ceo_initial_data_stage_character_traits_historical_liu_shen
0
-
-3k_main_ancillary_armour_light_armour_earth_metal_and_water_common
+
+3k_custom_ancillary_armour_metal
871123962
3k_main_ceo_initial_data_character_historical_lu_meng_ancillaries
0
@@ -13579,8 +13603,8 @@
3k_main_ceo_initial_data_character_historical_zhang_yan_ancillaries
0
-
-3k_main_ancillary_armour_medium_armour_earth_and_metal_common
+
+3k_custom_ancillary_armour_metal
977939239
3k_main_ceo_initial_data_character_historical_lu_meng_ancillaries
0
diff --git a/db/ceo_initial_data_equipments.xml b/db/ceo_initial_data_equipments.xml
index 92d2e73..79e1796 100644
--- a/db/ceo_initial_data_equipments.xml
+++ b/db/ceo_initial_data_equipments.xml
@@ -1,6 +1,6 @@
-
-5e0728c5-65f4-4bf6-a8af-1876bebd46d1
+
+628cb2c4-d55b-4c04-ada2-99dd297c697b
1000637708
3k_main_ceo_category_ancillary_armour
@@ -209,6 +209,14 @@
0
character_equipment
+
+1136757540
+3k_main_ceo_category_ancillary_mount
+3k_main_ancillary_mount_red_horse
+3k_main_ceo_initial_data_character_historical_gao_shun_ancillaries
+0
+character_equipment
+
1140137243
3k_main_ceo_category_ancillary_mount
@@ -1409,6 +1417,14 @@
0
character_equipment
+
+1882297704
+3k_main_ceo_category_ancillary_armour
+3k_custom_ancillary_armour_fire
+3k_main_ceo_initial_data_character_historical_gao_shun_ancillaries
+0
+character_equipment
+
1887112450
3k_main_ceo_category_ancillary_weapon
@@ -2689,10 +2705,10 @@
0
character_equipment
-
+
64515127
3k_main_ceo_category_ancillary_armour
-3k_main_ancillary_armour_strategist_light_armour_water_refined
+3k_custom_ancillary_armour_water
3k_main_ceo_initial_data_character_historical_guo_jia_ancillaries
0
character_equipment
@@ -2945,6 +2961,14 @@
0
character_equipment
+
+779616384
+3k_main_ceo_category_ancillary_weapon
+3k_main_ancillary_weapon_two_handed_spear_common
+3k_main_ceo_initial_data_character_historical_gao_shun_ancillaries
+0
+character_equipment
+
787325856
3k_main_ceo_category_ancillary_weapon
diff --git a/db/ceo_initial_data_scripted_permissions.xml b/db/ceo_initial_data_scripted_permissions.xml
index 5f9b737..5fbe1de 100644
--- a/db/ceo_initial_data_scripted_permissions.xml
+++ b/db/ceo_initial_data_scripted_permissions.xml
@@ -1,6 +1,6 @@
-
-d501e9a3-1444-47a9-af8f-edad8ebc0d14
+
+78938d2a-9499-4f9b-9819-9324328acd66
1005024699
3k_main_ceo_initial_data_character_historical_gongsun_du_ancillaries
@@ -621,6 +621,11 @@
3k_main_ceo_initial_data_character_historical_gongsun_zan_ancillaries
3k_main_ceo_permissions_ancillary_weapon_character_spear_two_handed_enable
+
+1327166129
+3k_main_ceo_initial_data_character_historical_gao_shun_ancillaries
+3k_main_ceo_permissions_ancillary_weapon_character_spear_two_handed_long_enable
+
1328475405
3k_ytr_ceo_initial_data_stage_character_learning_student
@@ -1511,6 +1516,11 @@
3k_main_ceo_initial_data_character_historical_lu_meng_ancillaries
3k_ytr_ceo_permissions_ancillary_weapon_character_mace_dual_enable
+
+1817670611
+3k_main_ceo_initial_data_character_historical_gao_shun_ancillaries
+3k_main_ceo_permissions_ancillary_weapon_character_axe_two_handed_enable
+
181885969
3k_main_ceo_initial_data_character_historical_cheng_pu_ancillaries
@@ -2271,6 +2281,11 @@
3k_main_ceo_initial_data_character_historical_sun_ce_ancillaries
3k_main_ceo_permissions_ancillary_weapon_character_spear_two_handed_enable
+
+321356508
+3k_main_ceo_initial_data_character_historical_gao_shun_ancillaries
+3k_main_ceo_permissions_ancillary_armour_character_fire_enable
+
322122849
3k_main_ceo_initial_data_character_generic_metal_ancillaries_02
@@ -3021,6 +3036,11 @@
ep_ceo_initial_data_character_historical_sima_ai_ancillaries
ep_ceo_permissions_ancillary_armour_character_specific_sima_ai
+
+794360732
+3k_main_ceo_initial_data_character_historical_gao_shun_ancillaries
+3k_main_ceo_permissions_ancillary_weapon_character_spear_two_handed_enable
+
801128831
ep_ceo_initial_data_character_generic_earth_ancillaries_01
diff --git a/db/ceo_initial_data_stages.xml b/db/ceo_initial_data_stages.xml
index bee3dcf..9a70282 100644
--- a/db/ceo_initial_data_stages.xml
+++ b/db/ceo_initial_data_stages.xml
@@ -1,6 +1,6 @@
-
-b534601f-f62f-4588-9db2-c07dd2a98726
+
+5697428d-6bf2-4114-99bc-78ac2c94a034
3k_custom_ceo_initial_data_character_historical_test_ancillaries
@@ -82,6 +82,9 @@
3k_main_ceo_initial_data_character_historical_gao_gan_ancillaries
+
+3k_main_ceo_initial_data_character_historical_gao_shun_ancillaries
+
3k_main_ceo_initial_data_character_historical_gongsun_du_ancillaries
diff --git a/db/ceo_initial_data_to_stages.xml b/db/ceo_initial_data_to_stages.xml
index 4b876d6..5c88779 100644
--- a/db/ceo_initial_data_to_stages.xml
+++ b/db/ceo_initial_data_to_stages.xml
@@ -1,6 +1,6 @@
-
-995f877c-1d09-4b85-969c-3394d19913ef
+
+cdaa95a5-fee2-49a6-ab94-f9e161fda28b
3k_main_ceo_initial_data_character_generic_f_earth_agent
3k_main_ceo_initial_data_stage_character_traits_shared_global_permissions
@@ -7286,9 +7286,9 @@
3k_main_ceo_initial_data_stage_character_potential_legendary
20
-
+
3k_main_ceo_initial_data_character_historical_gao_shun
-3k_main_ceo_initial_data_character_generic_fire_ancillaries_02
+3k_main_ceo_initial_data_character_historical_gao_shun_ancillaries
3
@@ -13971,9 +13971,9 @@
3k_main_initial_data_character_ancillaries_global
2
-
+
3k_main_ceo_initial_data_character_historical_xu_you
-3k_main_ceo_initial_data_character_historical_xun_yu_ancillaries
+3k_main_ceo_initial_data_character_generic_water_ancillaries_02
3
diff --git a/db/start_pos_characters.xml b/db/start_pos_characters.xml
index 608aed9..4a67832 100644
--- a/db/start_pos_characters.xml
+++ b/db/start_pos_characters.xml
@@ -1,6 +1,6 @@
-
-0a6c2b11-0b0f-4a59-a3f6-2a070d36ae94
+
+e5e45aa7-e969-4fb2-8a80-0c3ee8e01a51
1003320731
0
@@ -1409,7 +1409,7 @@
general
0
-
+
1250271511
0
@@ -1421,7 +1421,7 @@
0
0
-1
+0
0
1
1
@@ -4159,7 +4159,7 @@
general
0
-
+
1681642080
0
@@ -4168,7 +4168,7 @@
0
25
-
+faction_heir
0
0
0
@@ -5061,7 +5061,7 @@
general
0
-
+
1819384032
0
@@ -5073,7 +5073,7 @@
0
0
-0
+1
0
1
1
@@ -9021,6 +9021,28 @@
general
0
+
+426994814
+0
+
+2120137657
+0
+1
+
+25
+
+0
+0
+0
+0
+1
+1
+3k_general_fire
+3k_main_template_historical_zhou_tai_hero_fire
+
+general
+0
+
436818241
0
diff --git a/db/start_pos_factions.xml b/db/start_pos_factions.xml
index 29f71ed..48c02c5 100644
--- a/db/start_pos_factions.xml
+++ b/db/start_pos_factions.xml
@@ -1,6 +1,6 @@
-
-b8930571-af8c-4b8a-b931-9aba8f41e288
+
+b6807d04-7f6b-4a6c-83ee-df41b3ea39fb
100486735
default
@@ -8149,7 +8149,7 @@
2000
0
-
+
2120137618
default
minor
@@ -8174,7 +8174,7 @@
32
3
3k_main_taoist
-2000
+5000
0
@@ -8597,7 +8597,7 @@
2000
0
-
+
2120137707
default
major
@@ -8622,7 +8622,7 @@
23
3
3k_main_confucianism
-2000
+2500
0
diff --git a/db/start_pos_non_commanding_generals.xml b/db/start_pos_non_commanding_generals.xml
index 1e777aa..c56abb7 100644
--- a/db/start_pos_non_commanding_generals.xml
+++ b/db/start_pos_non_commanding_generals.xml
@@ -1,6 +1,6 @@
-
-5573d132-b2a0-4709-b084-42b097cb7fb0
+
+0ef3eddc-a0a1-4543-bde7-7ee16224b775
2069648037
1015280988
@@ -53,7 +53,7 @@
1350568697
1245728055
-
+
2118235322
1250271511
@@ -153,6 +153,10 @@
187611521
1796512874
+
+2140784002
+1819384032
+
187611521
1841574641
diff --git a/db/update_commands.txt b/db/update_commands.txt
index c8f3904..10cb231 100644
Binary files a/db/update_commands.txt and b/db/update_commands.txt differ