*Firing shots against save game corruption + Optimized Dale Scene + F…

…ixes to CWE Flora - Create new "safe_remove_party" to replace all instances of (remove_party) operation - Create new 'dormant' party system that reuses parties instead of removing them -- Currently used for prisoner trains and routed parties - Create unhirable troop for player garrison so that we are not creating the garrison party needlessly - Optimize Dale scene - Fix CWE Flora, making them actually appear - Other fixes...
tldmod · Apr 23, 2017 · 72b2021 · 72b2021
1 parent 6cae37d
commit 72b2021
Show file tree

Hide file tree

Showing 52 changed files with 3,124 additions and 1,982 deletions.
diff --git a/Data/flora_kinds.py b/Data/flora_kinds.py
diff --git a/Data/flora_kinds.txt b/Data/flora_kinds.txt
@@ -473,163 +473,163 @@ ga_tree_3_a_brown 94489288736 2
  PW_tree_3_a_brown  0
  PW_tree_3_b_brown  0
 CWE_oliva 0 5
- CWE_oliva_tree_a  oliva_tree_a_col
- CWE_oliva_tree_b  oliva_tree_b_col
- CWE_oliva_tree_c  oliva_tree_c_col
- CWE_oliva_tree_d  oliva_tree_d_col
- CWE_oliva_tree_e  oliva_tree_e_col
+ cwe_oliva_tree_a  oliva_tree_a_col
+ cwe_oliva_tree_b  oliva_tree_b_col
+ cwe_oliva_tree_c  oliva_tree_c_col
+ cwe_oliva_tree_d  oliva_tree_d_col
+ cwe_oliva_tree_e  oliva_tree_e_col
 CWE_pihta 0 3
- CWE_pihta_a  pihta_a_col
- CWE_pihta_b  pihta_b_col
- CWE_pihta_c  pihta_c_col
+ cwe_pihta_a  pihta_a_col
+ cwe_pihta_b  pihta_b_col
+ cwe_pihta_c  pihta_c_col
 CWE_apple_tree 0 6
- CWE_sp_apple_tree_1  bo_sp_apple_tree_1
- CWE_sp_apple_tree_2  bo_sp_apple_tree_2
- CWE_sp_apple_tree_3  bo_sp_apple_tree_3
- CWE_sp_apple_tree_4  bo_sp_apple_tree_4
- CWE_sp_apple_tree_5  bo_sp_apple_tree_5
- CWE_sp_apple_tree_6  bo_sp_apple_tree_6
+ cwe_sp_apple_tree_1  bo_sp_apple_tree_1
+ cwe_sp_apple_tree_2  bo_sp_apple_tree_2
+ cwe_sp_apple_tree_3  bo_sp_apple_tree_3
+ cwe_sp_apple_tree_4  bo_sp_apple_tree_4
+ cwe_sp_apple_tree_5  bo_sp_apple_tree_5
+ cwe_sp_apple_tree_6  bo_sp_apple_tree_6
 CWE_magnolia 0 5
- CWE_sp_magnolia_1  bo_sp_magnolia_1
- CWE_sp_magnolia_2  bo_sp_magnolia_2
- CWE_sp_magnolia_3  bo_sp_magnolia_3
- CWE_sp_magnolia_4  bo_sp_magnolia_4
- CWE_sp_magnolia_5  bo_sp_magnolia_5
+ cwe_sp_magnolia_1  bo_sp_magnolia_1
+ cwe_sp_magnolia_2  bo_sp_magnolia_2
+ cwe_sp_magnolia_3  bo_sp_magnolia_3
+ cwe_sp_magnolia_4  bo_sp_magnolia_4
+ cwe_sp_magnolia_5  bo_sp_magnolia_5
 CWE_magnolia_large 0 2
- CWE_sp_magnolia_large_1  bo_sp_magnolia_large_1
- CWE_sp_magnolia_large_2  bo_sp_magnolia_large_2
+ cwe_sp_magnolia_large_1  bo_sp_magnolia_large_1
+ cwe_sp_magnolia_large_2  bo_sp_magnolia_large_2
 CWE_peach_tree 0 5
- CWE_sp_peach_tree_1  bo_sp_peach_tree_1
- CWE_sp_peach_tree_2  bo_sp_peach_tree_2
- CWE_sp_peach_tree_3  bo_sp_peach_tree_3
- CWE_sp_peach_tree_4  bo_sp_peach_tree_4
- CWE_sp_peach_tree_5  bo_sp_peach_tree_5
+ cwe_sp_peach_tree_1  bo_sp_peach_tree_1
+ cwe_sp_peach_tree_2  bo_sp_peach_tree_2
+ cwe_sp_peach_tree_3  bo_sp_peach_tree_3
+ cwe_sp_peach_tree_4  bo_sp_peach_tree_4
+ cwe_sp_peach_tree_5  bo_sp_peach_tree_5
 CWE_bush_a 0 10
- CWE_sp_bush_a_1  0
- CWE_sp_bush_a_2  0
- CWE_sp_bush_a_3  0
- CWE_sp_bush_a_4  0
- CWE_sp_bush_a_5  0
- CWE_sp_bush_a_6  0
- CWE_sp_bush_a_7  0
- CWE_sp_bush_a_8  0
- CWE_sp_bush_a_9  0
- CWE_sp_bush_a_10  0
+ cwe_sp_bush_a_1  0
+ cwe_sp_bush_a_2  0
+ cwe_sp_bush_a_3  0
+ cwe_sp_bush_a_4  0
+ cwe_sp_bush_a_5  0
+ cwe_sp_bush_a_6  0
+ cwe_sp_bush_a_7  0
+ cwe_sp_bush_a_8  0
+ cwe_sp_bush_a_9  0
+ cwe_sp_bush_a_10  0
 CWE_bush_b 0 10
- CWE_sp_bush_b_1  0
- CWE_sp_bush_b_2  0
- CWE_sp_bush_b_3  0
- CWE_sp_bush_b_4  0
- CWE_sp_bush_b_5  0
- CWE_sp_bush_b_6  0
- CWE_sp_bush_b_7  0
- CWE_sp_bush_b_8  0
- CWE_sp_bush_b_9  0
- CWE_sp_bush_b_10  0
+ cwe_sp_bush_b_1  0
+ cwe_sp_bush_b_2  0
+ cwe_sp_bush_b_3  0
+ cwe_sp_bush_b_4  0
+ cwe_sp_bush_b_5  0
+ cwe_sp_bush_b_6  0
+ cwe_sp_bush_b_7  0
+ cwe_sp_bush_b_8  0
+ cwe_sp_bush_b_9  0
+ cwe_sp_bush_b_10  0
 CWE_small_bush_a 0 5
- CWE_sp_small_bush_a_1  0
- CWE_sp_small_bush_a_2  0
- CWE_sp_small_bush_a_3  0
- CWE_sp_small_bush_a_4  0
- CWE_sp_small_bush_a_5  0
+ cwe_sp_small_bush_a_1  0
+ cwe_sp_small_bush_a_2  0
+ cwe_sp_small_bush_a_3  0
+ cwe_sp_small_bush_a_4  0
+ cwe_sp_small_bush_a_5  0
 CWE_small_bush_b 0 5
- CWE_sp_small_bush_b_1  0
- CWE_sp_small_bush_b_2  0
- CWE_sp_small_bush_b_3  0
- CWE_sp_small_bush_b_4  0
- CWE_sp_small_bush_b_5  0
+ cwe_sp_small_bush_b_1  0
+ cwe_sp_small_bush_b_2  0
+ cwe_sp_small_bush_b_3  0
+ cwe_sp_small_bush_b_4  0
+ cwe_sp_small_bush_b_5  0
 CWE_juniper 0 4
- CWE_sp_juniper_1  0
- CWE_sp_juniper_2  0
- CWE_sp_juniper_3  0
- CWE_sp_juniper_4  0
+ cwe_sp_juniper_1  0
+ cwe_sp_juniper_2  0
+ cwe_sp_juniper_3  0
+ cwe_sp_juniper_4  0
 CWE_myrtle_a 0 3
- CWE_sp_myrtle_a_1  bo_sp_myrtle_a_1
- CWE_sp_myrtle_a_2  bo_sp_myrtle_a_2
- CWE_sp_myrtle_a_3  bo_sp_myrtle_a_3
+ cwe_sp_myrtle_a_1  bo_sp_myrtle_a_1
+ cwe_sp_myrtle_a_2  bo_sp_myrtle_a_2
+ cwe_sp_myrtle_a_3  bo_sp_myrtle_a_3
 CWE_myrtle_b 0 5
- CWE_sp_myrtle_b_1  bo_sp_myrtle_b_1
- CWE_sp_myrtle_b_2  bo_sp_myrtle_b_2
- CWE_sp_myrtle_b_3  bo_sp_myrtle_b_3
- CWE_sp_myrtle_b_4  bo_sp_myrtle_b_4
- CWE_sp_myrtle_b_5  bo_sp_myrtle_b_5
+ cwe_sp_myrtle_b_1  bo_sp_myrtle_b_1
+ cwe_sp_myrtle_b_2  bo_sp_myrtle_b_2
+ cwe_sp_myrtle_b_3  bo_sp_myrtle_b_3
+ cwe_sp_myrtle_b_4  bo_sp_myrtle_b_4
+ cwe_sp_myrtle_b_5  bo_sp_myrtle_b_5
 CWE_azalia 0 3
- CWE_sp_azalia_1  0
- CWE_sp_azalia_2  0
- CWE_sp_azalia_3  0
+ cwe_sp_azalia_1  0
+ cwe_sp_azalia_2  0
+ cwe_sp_azalia_3  0
 CWE_beech 0 5
- CWE_sp_beech_1  bo_sp_beech_1
- CWE_sp_beech_2  bo_sp_beech_2
- CWE_sp_beech_3  bo_sp_beech_3
- CWE_sp_beech_4  bo_sp_beech_4
- CWE_sp_beech_5  bo_sp_beech_5
+ cwe_sp_beech_1  bo_sp_beech_1
+ cwe_sp_beech_2  bo_sp_beech_2
+ cwe_sp_beech_3  bo_sp_beech_3
+ cwe_sp_beech_4  bo_sp_beech_4
+ cwe_sp_beech_5  bo_sp_beech_5
 CWE_pine 0 3
- CWE_sp_pine_1  bo_sp_pine_1
- CWE_sp_pine_2  bo_sp_pine_2
- CWE_sp_pine_3  bo_sp_pine_3
+ cwe_sp_pine_1  bo_sp_pine_1
+ cwe_sp_pine_2  bo_sp_pine_2
+ cwe_sp_pine_3  bo_sp_pine_3
 CWE_pine_b 0 4
- CWE_sp_pine_b_1  bo_sp_pine_b_1
- CWE_sp_pine_b_2  bo_sp_pine_b_2
- CWE_sp_pine_b_3  bo_sp_pine_b_3
- CWE_sp_pine_b_4  bo_sp_pine_b_4
+ cwe_sp_pine_b_1  bo_sp_pine_b_1
+ cwe_sp_pine_b_2  bo_sp_pine_b_2
+ cwe_sp_pine_b_3  bo_sp_pine_b_3
+ cwe_sp_pine_b_4  bo_sp_pine_b_4
 CWE_desert_flora_b 0 5
- CWE_desert_flora_b_1  0
- CWE_desert_flora_b_2  0
- CWE_desert_flora_b_3  0
- CWE_desert_flora_b_4  0
- CWE_desert_flora_b_5  0
+ cwe_desert_flora_b_1  0
+ cwe_desert_flora_b_2  0
+ cwe_desert_flora_b_3  0
+ cwe_desert_flora_b_4  0
+ cwe_desert_flora_b_5  0
 CWE_desert_flora_c 0 3
- CWE_desert_flora_c_1  0
- CWE_desert_flora_c_2  0
- CWE_desert_flora_c_3  0
+ cwe_desert_flora_c_1  0
+ cwe_desert_flora_c_2  0
+ cwe_desert_flora_c_3  0
 CWE_lavender 0 1
- CWE_plain_flowers_lavender  0
+ cwe_plain_flowers_lavender  0
 CWE_tulips_red 0 1
- CWE_plain_flowers_tulips  0
+ cwe_plain_flowers_tulips  0
 CWE_tulips_white 0 1
- CWE_plain_flowers_white  0
+ cwe_plain_flowers_white  0
 CWE_sagebrush 0 1
- CWE_sagebrush  0
+ cwe_sagebrush  0
 CWE_reed 0 7
- CWE_sedge_a_1  0
- CWE_sedge_a_2  0
- CWE_sedge_a_3  0
- CWE_sedge_a_4  0
- CWE_sedge_a_5  0
- CWE_sedge_a_6  0
- CWE_sedge_a_7  0
+ cwe_sedge_a_1  0
+ cwe_sedge_a_2  0
+ cwe_sedge_a_3  0
+ cwe_sedge_a_4  0
+ cwe_sedge_a_5  0
+ cwe_sedge_a_6  0
+ cwe_sedge_a_7  0
 CWE_tropical_flora_a 0 4
- CWE_tropical_flora_a_1  0
- CWE_tropical_flora_a_2  0
- CWE_tropical_flora_a_3  0
- CWE_tropical_flora_a_4  0
+ cwe_tropical_flora_a_1  0
+ cwe_tropical_flora_a_2  0
+ cwe_tropical_flora_a_3  0
+ cwe_tropical_flora_a_4  0
 CWE_yellow_flower_small 0 3
- CWE_weed_11-111  0
- CWE_weed_11a-111  0
- CWE_weed_11b---111  0
+ cwe_weed_11-111  0
+ cwe_weed_11a-111  0
+ cwe_weed_11b---111  0
 CWE_yellow_flower_big 0 4
- CWE_weed_14  0
- CWE_weed_14a  0
- CWE_weed_14b  0
- CWE_weed_14c  0
+ cwe_weed_14  0
+ cwe_weed_14a  0
+ cwe_weed_14b  0
+ cwe_weed_14c  0
 CWE_weed_b_2 0 4
- CWE_weed_b_2  0
- CWE_weed_b_2a  0
- CWE_weed_b_2b  0
- CWE_weed_b_2c  0
+ cwe_weed_b_2  0
+ cwe_weed_b_2a  0
+ cwe_weed_b_2b  0
+ cwe_weed_b_2c  0
 CWE_weed_2 0 3
- CWE_weed_2  0
- CWE_weed_2a  0
- CWE_weed_2b  0
+ cwe_weed_2  0
+ cwe_weed_2a  0
+ cwe_weed_2b  0
 CWE_weed_other 0 4
- CWE_weed_5  0
- CWE_weed_1  0
- CWE_sa_kust_3  0
- CWE_sa_kust_4  0
+ cwe_weed_5  0
+ cwe_weed_1  0
+ cwe_sa_kust_3  0
+ cwe_sa_kust_4  0
 CWE_ivy 0 1
- CWE_ivy  0
+ cwe_ivy  0
 CWE_ivy_wall 0 1
- CWE_ivy_wall  0
+ cwe_ivy_wall  0
 Jaakko_new_tree_a 0 2
  Jaakko_new_tree_a  bo_Jaakko_new_tree_a
  Jaakko_new_tree_a_double  bo_Jaakko_new_tree_a_double

diff --git a/ModuleSystem/ID/ID_scripts_mb.py b/ModuleSystem/ID/ID_scripts_mb.py
@@ -513,5 +513,9 @@
 script_find_closest_enemy_town_or_host_only = 512
 script_cf_gain_trait_butcher = 513
 script_force_faction_center_by_region = 514
+script_safe_remove_party = 515
+script_remove_party = 516
+script_spawn_around_party = 517
+script_set_spawn_radius = 518
 
 
diff --git a/ModuleSystem/ID/ID_scripts_wb.py b/ModuleSystem/ID/ID_scripts_wb.py
@@ -516,21 +516,25 @@
 script_find_closest_enemy_town_or_host_only = 515
 script_cf_gain_trait_butcher = 516
 script_force_faction_center_by_region = 517
-script_game_get_upgrade_cost = 518
-script_game_get_morale_of_troops_from_faction = 519
-script_troop_tree_recursive_backtracking = 520
-script_troop_tree_recursive_detect_max_tier = 521
-script_prsnt_line = 522
-script_get_page_no_of_troop_tree_for_troop_on = 523
-script_init_camera = 524
-script_dmod_cycle_forwards = 525
-script_dmod_cycle_backwards = 526
-script_agent_fix_division = 527
-script_weapon_use_backup_weapon = 528
-script_weapon_use_classify_agent = 529
-script_cf_order_skirmish_check = 530
-script_order_skirmish_begin_end = 531
-script_order_skirmish_skirmish = 532
-script_ce_get_troop_encumbrance = 533
+script_safe_remove_party = 518
+script_remove_party = 519
+script_spawn_around_party = 520
+script_set_spawn_radius = 521
+script_game_get_upgrade_cost = 522
+script_game_get_morale_of_troops_from_faction = 523
+script_troop_tree_recursive_backtracking = 524
+script_troop_tree_recursive_detect_max_tier = 525
+script_prsnt_line = 526
+script_get_page_no_of_troop_tree_for_troop_on = 527
+script_init_camera = 528
+script_dmod_cycle_forwards = 529
+script_dmod_cycle_backwards = 530
+script_agent_fix_division = 531
+script_weapon_use_backup_weapon = 532
+script_weapon_use_classify_agent = 533
+script_cf_order_skirmish_check = 534
+script_order_skirmish_begin_end = 535
+script_order_skirmish_skirmish = 536
+script_ce_get_troop_encumbrance = 537
 
 
diff --git a/ModuleSystem/ID/ID_troops.py b/ModuleSystem/ID/ID_troops.py
@@ -916,11 +916,12 @@
 trp_beorning_shield_bear = 915
 trp_test_vet_archer = 916
 trp_volunteers = 917
-trp_last = 918
-trp_multiplayer_profile_troop_male = 919
-trp_multiplayer_profile_troop_female = 920
-trp_future_troop_6 = 921
-trp_future_troop_7 = 922
-trp_future_troop_8 = 923
-trp_future_troop_9 = 924
-trp_future_troop_10 = 925
+trp_dormant = 918
+trp_last = 919
+trp_multiplayer_profile_troop_male = 920
+trp_multiplayer_profile_troop_female = 921
+trp_future_troop_6 = 922
+trp_future_troop_7 = 923
+trp_future_troop_8 = 924
+trp_future_troop_9 = 925
+trp_future_troop_10 = 926
diff --git a/ModuleSystem/module_constants.py b/ModuleSystem/module_constants.py
@@ -2337,3 +2337,9 @@ def concatenate_scripts(block_list):
 
 #War Council Slots
 slot_faction_war_council = 305
+
+#New Party Creation/Removal system
+slot_party_dormant = 306
+
+
+