*Ensure Faction Marshalls have hosts if their faction is not wavering…

… + Fixes to InVain's Ambience Scenes - Changes to module_scripts_ai to make sure marshalls have hosts (this increases likelihood of campaigns) - Fixes to InVain's Ambience Scenes
tldmod · May 19, 2017 · 945e7d0 · 945e7d0
1 parent 585fbbc
commit 945e7d0
Show file tree

Hide file tree

Showing 15 changed files with 208 additions and 151 deletions.
diff --git a/ModuleSystem/module_dialogs.py b/ModuleSystem/module_dialogs.py
@@ -1564,18 +1564,18 @@
       (troop_get_slot, ":reserve_party", "trp_player", slot_troop_player_reserve_party),
 
     ## Kham - Remove this code, as we are trying to create the volunteer party ONLY ONCE, then just keep refilling it, instead of recreating it.
-    #(try_begin),
-  	#	(gt, ":reserve_party", 0),
-  	#	(neg|party_is_active, ":reserve_party"), # depleted
-   	#	(assign, ":reserve_party", 0),
-	  #(try_end),
+    (try_begin),
+  		(gt, ":reserve_party", 0),
+  		(neg|party_is_active, ":reserve_party"), # depleted
+   		(assign, ":reserve_party", 0),
+	  (try_end),
 
       (try_begin),
 		(eq, ":reserve_party", 0), #first time or depleted
         (spawn_around_party, "$g_encountered_party", "pt_volunteers"),
         (assign, ":reserve_party", reg0),
-        #(party_add_members, ":reserve_party", "trp_looter", 1), #.. or change_screen_exchange_with_party will crash
-        #(party_remove_members, ":reserve_party", "trp_looter", 1),
+        (party_add_members, ":reserve_party", "trp_looter", 1), #.. or change_screen_exchange_with_party will crash
+        (party_remove_members, ":reserve_party", "trp_looter", 1),
         (troop_set_slot, "trp_player", slot_troop_player_reserve_party, ":reserve_party"),
         (party_attach_to_party, ":reserve_party", "$g_encountered_party"),
         (party_set_name, ":reserve_party", "@{playername}'s Reserves"),

diff --git a/ModuleSystem/module_scene_props.py b/ModuleSystem/module_scene_props.py
@@ -1832,7 +1832,7 @@
 ("mor_tower_a",0,"mor_tower_a","bo_mor_tower_a", []),
 ("evil_element",0,"evil_element","0", []),
 ("evil_tunnel_a",0,"evil_tunnel_a","bo_evil_tunnel_a", []),
-("minas_tirith_copy",0,"minas_tirith_copy","0", []),
+("minas_tirith_copy",0,"minas_tirith_new","0", []),
 
 ##### CENTER GUARDS #####
 ("troop_guard",sokf_invisible,"cabbage_b","0", [(ti_on_init_scene_prop,[

diff --git a/ModuleSystem/module_scripts.py b/ModuleSystem/module_scripts.py
@@ -10320,7 +10320,7 @@ def set_item_score():
 			(try_end),
 	(else_try), #Pelennor fields
 		(eq,":region",region_pelennor), #InVain: Keep this AFTER Minas_Tirith_outside and Osgiliath_Outskirts landmark scenes!
-		(store_random_in_range, ":scene_to_use", "scn_pelennor_1", "scn_hornburg_near"),
+		(store_random_in_range, ":scene_to_use", "scn_pelennor_1", "scn_village_gondor_battlefield_1"),
 #InVain new landmark scenes end
 	(else_try),
 		(eq,":landmark","p_town_isengard"),

diff --git a/ModuleSystem/module_scripts_ai.py b/ModuleSystem/module_scripts_ai.py
diff --git a/Resource/JB_map_icons.brf b/Resource/JB_map_icons.brf
diff --git a/Resource/JB_terrain_borders_TLD.brf b/Resource/JB_terrain_borders_TLD.brf
diff --git a/SceneObj/scn_moria_outside_1.sco b/SceneObj/scn_moria_outside_1.sco
diff --git a/SceneObj/scn_moria_outside_2.sco b/SceneObj/scn_moria_outside_2.sco
diff --git a/_wb/Data/flora_kinds.txt b/_wb/Data/flora_kinds.txt
@@ -584,7 +584,7 @@ zl_bush_steppe_wheat 0 3
  PW_bushes12_a_xx  0
  PW_bushes12_b_xx  0
  PW_bushes12_c_xx  0
-zl_pink_tree 4194304 3
+zl_pink_tree 42953867268 3
  PW_tall_tree_a  bo_pw_tall_tree_a_cyl
  0 0
  PW_pine_4_a  bo_pw_pine_4_a_cyl
@@ -647,39 +647,54 @@ zl_fir_shubby_single 21479038992 4
 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 8594128900 5
  cwe_oliva_tree_a  oliva_tree_a_col
+ 0 0
  cwe_oliva_tree_b  oliva_tree_b_col
+ 0 0
  cwe_oliva_tree_c  oliva_tree_c_col
+ 0 0
  cwe_oliva_tree_d  oliva_tree_d_col
+ 0 0
  cwe_oliva_tree_e  oliva_tree_e_col
-CWE_pihta 0 3
+ 0 0
+CWE_pihta 25773998084 3
  cwe_pihta_a  pihta_a_col
+ 0 0
  cwe_pihta_b  pihta_b_col
+ 0 0
  cwe_pihta_c  pihta_c_col
+ 0 0
 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_magnolia 0 5
+CWE_magnolia 8594128900 5
  cwe_sp_magnolia_1  bo_sp_magnolia_1
+ 0 0
  cwe_sp_magnolia_2  bo_sp_magnolia_2
+ 0 0
  cwe_sp_magnolia_3  bo_sp_magnolia_3
+ 0 0
  cwe_sp_magnolia_4  bo_sp_magnolia_4
+ 0 0
  cwe_sp_magnolia_5  bo_sp_magnolia_5
-CWE_magnolia_large 0 2
+ 0 0
+CWE_magnolia_large 8594128900 2
  cwe_sp_magnolia_large_1  bo_sp_magnolia_large_1
+ 0 0
  cwe_sp_magnolia_large_2  bo_sp_magnolia_large_2
+ 0 0
 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_bush_a 0 10
+CWE_bush_a 42949672964 10
  cwe_sp_bush_a_1  0
  cwe_sp_bush_a_2  0
  cwe_sp_bush_a_3  0
@@ -690,7 +705,7 @@ CWE_bush_a 0 10
  cwe_sp_bush_a_8  0
  cwe_sp_bush_a_9  0
  cwe_sp_bush_a_10  0
-CWE_bush_b 0 10
+CWE_bush_b 42949672964 10
  cwe_sp_bush_b_1  0
  cwe_sp_bush_b_2  0
  cwe_sp_bush_b_3  0
@@ -701,19 +716,19 @@ CWE_bush_b 0 10
  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_small_bush_a 42949672964 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_small_bush_b 0 5
+CWE_small_bush_b 42949672964 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_juniper 0 4
+CWE_juniper 85899345924 4
  cwe_sp_juniper_1  0
  cwe_sp_juniper_2  0
  cwe_sp_juniper_3  0
@@ -722,16 +737,24 @@ 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_myrtle_b 0 5
+CWE_myrtle_b 30068965380 5
  cwe_sp_myrtle_b_1  bo_sp_myrtle_b_1
+ 0 0
  cwe_sp_myrtle_b_2  bo_sp_myrtle_b_2
+ 0 0
  cwe_sp_myrtle_b_3  bo_sp_myrtle_b_3
+ 0 0
  cwe_sp_myrtle_b_4  bo_sp_myrtle_b_4
+ 0 0
  cwe_sp_myrtle_b_5  bo_sp_myrtle_b_5
-CWE_azalia 0 3
+ 0 0
+CWE_azalia 30068965380 3
  cwe_sp_azalia_1  0
+ 0 0
  cwe_sp_azalia_2  0
+ 0 0
  cwe_sp_azalia_3  0
+ 0 0
 CWE_beech 0 5
  cwe_sp_beech_1  bo_sp_beech_1
  cwe_sp_beech_2  bo_sp_beech_2
@@ -757,13 +780,13 @@ 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_lavender 0 1
+CWE_lavender 214748626948 1
  cwe_plain_flowers_lavender  0
 CWE_tulips_red 0 1
  cwe_plain_flowers_tulips  0
 CWE_tulips_white 0 1
  cwe_plain_flowers_white  0
-CWE_sagebrush 0 1
+CWE_sagebrush 214748626948 1
  cwe_sagebrush  0
 CWE_reed 0 7
  cwe_sedge_a_1  0
@@ -808,12 +831,14 @@ CWE_ivy_wall 0 1
 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
-Jaakko_new_cypress 0 2
+Jaakko_new_cypress 17184063492 2
  Jaakko_new_cypress  bo_Jaakko_new_cypress
+ 0 0
  Jaakko_new_cypress2  bo_Jaakko_new_cypress2
+ 0 0
 grass_flower_white_nofade 0 2
  PW_grass_flower_c_xx  0
  PW_grass_flower_c_xx  0
 grass_flower_yellow_nofade 0 2
  PW_grass_flower_e_xx  0
- PW_grass_flower_e_xx  0
+ PW_grass_flower_e_xx  0
diff --git a/_wb/conversation.txt b/_wb/conversation.txt
@@ -190,7 +190,7 @@ dlga_companion_home_description_3:close_window 4095 105  2 520 3 122497909864477
 dlga_start:player_hire_troop 4095 0  31 31 2 144115188075855951 16 2330 2 21 144115188075855998 2335 2 22 144115188075856308 2335 2 14 144115188075856308 2322 2 23 144115188075855970 1 2 11 144115188075855993 2321 2 29 24 1 2 11 144115188075856308 2335 2 25 144115188075855993 2133 2 72057594037927962 0 4 0 31 2 144115188075855993 144115188075856308 2133 2 72057594037927962 1 3 0 1601 2 72057594037927963 0 1 2 15 144115188075856308 2133 2 1224979098644774912 72057594037927936 4 0 31 2 72057594037927962 1 2320 2 33 1585267068834415691 5 0 30 2 1224979098644774912 4 2320 2 33 1585267068834415691 5 0 30 2 1224979098644774912 1 2320 2 33 1585267068834415692 5 0 2320 2 33 1585267068834415693 3 0 1 3 96 9 0 1 4 58 9 1 144115188075856308 {s33}^^I_am_in_charge_of_the_forces_garrisoned_here_at_{s21}._Did_you_want_to_see_me?  106  0 
 dlga_player_hire_troop:player_hire_troop_take 69631 106  8 1633 2 72057594037927946 0 32 2 72057594037927946 0 4 0 542 3 144115188075855893 158 0 2320 2 4 1585267068834415694 5 0 2320 2 4 1585267068834415695 3 0 {s4}  107  10 521 3 144115188075855913 144115188075856029 66 2133 2 144115188075855914 0 4 0 32 2 144115188075855913 0 132 1 144115188075855913 2156 2 144115188075855914 144115188075855913 1320 1 144115188075855913 1 2 56 144115188075855913 2133 2 144115188075855915 72057594037927936 3 0 
 dlga_player_hire_troop:player_hire_troop_give 69631 106  2 1601 2 72057594037927947 9 32 2 72057594037927947 1 Some_of_the_soldiers_in_my_group_would_be_more_useful_here,_to_defend_{s21}.  108  6 1617 1 9 2133 2 144115188075855907 0 1 3 91 9 0 1601 2 72057594037927964 0 1 3 21 0 1 2133 2 144115188075856502 72057594037927936 
-dlga_player_hire_troop:close_window 69631 106  12 542 3 144115188075855993 154 144115188075855998 520 3 1224979098644774912 0 50 4 0 31 2 1224979098644774912 0 1100 2 144115188075855998 255 2133 2 1224979098644774912 72057594037927936 500 3 0 50 1224979098644774912 1660 2 1224979098644774912 144115188075855998 1669 2 1224979098644774912 1585267068834415696 1603 2 1224979098644774912 524288 1640 2 1224979098644774912 0 3 0 I_want_to_review_my_soldiers_stationed_here.  6  2 1 1 402 2060 1 151 
+dlga_player_hire_troop:close_window 69631 106  19 542 3 144115188075855993 154 144115188075855998 520 3 1224979098644774912 0 50 4 0 32 2 1224979098644774912 0 2147483780 1 1224979098644774912 2133 2 1224979098644774912 0 3 0 4 0 31 2 1224979098644774912 0 1100 2 144115188075855998 255 2133 2 1224979098644774912 72057594037927936 1610 3 1224979098644774912 436 1 1615 3 1224979098644774912 436 1 500 3 0 50 1224979098644774912 1660 2 1224979098644774912 144115188075855998 1669 2 1224979098644774912 1585267068834415696 1603 2 1224979098644774912 524288 1640 2 1224979098644774912 0 3 0 I_want_to_review_my_soldiers_stationed_here.  6  2 1 1 402 2060 1 151 
 dlga_player_hire_troop:close_window.1 69631 106  1 2147484189 3 144115188075855998 16 -1 I_need_some_training.  6  2 1 1 402 2060 1 128 
 dlga_player_hire_troop:tld_sell_prisoners 69631 106  2 2159 1 72057594037927941 30 2 72057594037927941 1 I_have_brought_you_some_prisoners.  109  0 
 dlga_tld_sell_prisoners:tld_sell_prisoners_check 4095 109  15 4 0 30 2 72057594037927941 30 2320 2 33 1585267068834415697 5 0 30 2 72057594037927941 20 2320 2 33 1585267068834415698 5 0 30 2 72057594037927941 10 2320 2 33 1585267068834415699 5 0 30 2 72057594037927941 5 2320 2 33 1585267068834415700 5 0 2320 2 33 1585267068834415701 3 0 {s33}_Let's_see_the_wretched_scum.  110  1 2044 0 

diff --git a/_wb/scene_props.txt b/_wb/scene_props.txt
@@ -3463,7 +3463,7 @@ spr_evil_element 0 0 evil_element 0 0
 spr_evil_tunnel_a 0 0 evil_tunnel_a bo_evil_tunnel_a 0
 
 
-spr_minas_tirith_copy 0 0 minas_tirith_copy 0 0
+spr_minas_tirith_copy 0 0 minas_tirith_new 0 0
 
 
 spr_troop_guard 16384 0 cabbage_b 0 1