* Make sure the tier_X troop changes are savegame compatible + remove…

… form AI from Animal Ambush
tldmod · Mar 6, 2019 · 1e582d0 · 1e582d0
1 parent d000144
commit 1e582d0
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 93 deletions.
diff --git a/ModuleSystem/module_mission_templates.py b/ModuleSystem/module_mission_templates.py
@@ -6521,7 +6521,7 @@
 	# Triggers
   tld_common_wb_muddy_water+
 	common_deathcam_triggers +
-  moto_formations_triggers + 
+  #moto_formations_triggers + 
   khams_custom_player_camera+
   fade+ [
 

diff --git a/ModuleSystem/module_scripts.py b/ModuleSystem/module_scripts.py
@@ -1929,7 +1929,7 @@ def set_item_score():
 	(call_script, "script_set_slot_light_armor"),
 
     #Rafa: Savegame version
-    (assign,"$savegame_version",8),
+    (assign,"$savegame_version",9),
 
 	] + (is_a_wb_script==1 and [
 
@@ -23595,6 +23595,16 @@ def set_item_score():
     	(assign, "$battle_encounter_effects", 1),
     	(assign, "$savegame_version",8),
     (try_end),
+
+    (try_begin), #Kham - March 2019
+    	(lt, "$savegame_version", 8),
+    	(faction_set_slot, "fac_guldur", slot_faction_tier_1_troop, trp_orc_snaga_of_guldur ),
+    	(faction_set_slot, "fac_guldur", slot_faction_tier_2_troop, trp_orc_of_guldur ),
+    	(faction_set_slot, "fac_guldur", slot_faction_tier_3_troop, trp_orc_tracker_of_mordor ),
+    	(faction_set_slot, "fac_guldur", slot_faction_tier_4_troop, trp_fell_orc_tracker_of_mordor ),
+    	(faction_set_slot, "fac_guldur", slot_faction_tier_5_troop, trp_great_warg_rider_of_mordor ),
+    	(assign, "$savegame_version", 9),
+    (try_end),
 ]),
 
 #Kham

diff --git a/_wb/mission_templates.txt b/_wb/mission_templates.txt
diff --git a/_wb/scripts.txt b/_wb/scripts.txt
diff --git a/_wb/variable_uses.txt b/_wb/variable_uses.txt
@@ -94,7 +94,7 @@
 4
 4
 38
-79
+76
 29
 221
 1
@@ -113,7 +113,7 @@
 5
 6
 40
-503
+468
 7
 5
 26
@@ -124,7 +124,7 @@
 4
 9
 2
-463
+461
 13
 12
 7
@@ -202,18 +202,18 @@
 38
 29
 4
-232
-1116
+223
+1066
 2
 2
 2
 2
 12
 3
 3
-17
-142
-26
+16
+134
+24
 3
 5
 4
@@ -249,16 +249,16 @@
 64
 2
 65
-40
-34
+38
+32
 60
 26
 26
 26
 1
-42
+41
 20
-39
+38
 12
 8
 6
@@ -272,7 +272,7 @@
 16
 3
 4
-26
+24
 7
 3
 4
@@ -698,15 +698,15 @@
 3
 2
 6
-16
-510
+15
+471
 29
 3
 3
 10
 114
 1
-14
+15
 3
 3
 9
@@ -775,9 +775,9 @@
 2
 3
 1
-171
+162
 7
-134
+125
 3
 17
 21
@@ -788,8 +788,8 @@
 3
 22
 22
-22
-11
+20
+10
 7
 1
 1
@@ -840,7 +840,7 @@
 1
 1
 1
-37
+36
 3
 8
 1
@@ -866,30 +866,30 @@
 1
 3
 2
-55
+50
 3
 3
 3
 3
 2
-33
+30
 3
-44
+40
 1
 1
 1
 1
-11
-11
-33
-22
-33
-11
-22
+10
+10
+30
+20
+30
+10
+20
 6
 10
-14
+13
 8
-38
+37
 1
 4
diff --git a/mission_templates.txt b/mission_templates.txt
@@ -2970,11 +2970,10 @@ You_are_ambushed_by_an_animal.
 28 8208 0 0 1 0  
 29 8208 0 0 1 0  
 30 8208 0 0 1 0  
-13
+12
 0 0 100000000  0  6 2133 2 144115188075856114 0 1799 2 1 2 726 2 144115188075856160 1 727 2 144115188075856161 1 726 2 144115188075856162 2 727 2 144115188075856163 2 
 0 4 100000000  2 1006 0 31 2 144115188075856114 0  1 2133 2 144115188075856114 1 
 0 0 0  9 31 2 144115188075856114 1 1073741897 1 0 1073741896 1 0 1073741897 1 1 1073741896 1 1 1073741897 1 2 1073741896 1 2 1073741897 1 3 72 1 3  29 1700 1 1224979098644774912 1709 2 1 1224979098644774912 4 0 1073741897 1 0 72 1 0 721 2 1 18 3 0 4 0 1073741897 1 1 72 1 1 721 2 1 -18 3 0 4 0 1073741897 1 2 72 1 2 720 2 1 -13 3 0 4 0 1073741897 1 3 72 1 3 720 2 1 13 3 0 726 2 1224979098644774913 1 727 2 1224979098644774914 1 4 0 33 3 1224979098644774913 144115188075856160 144115188075856162 33 3 1224979098644774914 144115188075856161 144115188075856163 1711 2 1224979098644774912 1 3 0 
-0 0 100000000  0  6 2133 2 144115188075856114 0 1799 2 1 2 726 2 144115188075856160 1 727 2 144115188075856161 1 726 2 144115188075856162 2 727 2 144115188075856163 2 
 -25 0 0  0  5 2071 1 1224979098644774912 1704 1 1224979098644774912 1718 2 1224979098644774913 1224979098644774912 33 3 1224979098644774913 892 895 2133 2 144115188075856564 1 
 1 0 0  2 2370 1 72057594037927937 30 2 72057594037927937 5  48 2133 2 144115188075856116 0 12 1 1224979098644774912 2147485352 1 1224979098644774912 1719 2 1224979098644774913 1224979098644774912 4 0 1073741857 3 1224979098644774913 23 60 31 2 1224979098644774913 864 4 0 1702 1 1224979098644774912 2136 3 1224979098644774914 1 101 4 0 2147483680 2 1224979098644774914 7 1750 2 1224979098644774912 262 3 0 5 0 545 3 1224979098644774912 17 0 1750 2 1224979098644774912 261 505 3 1224979098644774912 17 1 3 0 5 0 31 2 1224979098644774913 908 4 0 1702 1 1224979098644774912 2136 3 1224979098644774914 1 101 4 0 2147483680 2 1224979098644774914 7 1750 2 1224979098644774912 273 3 0 5 0 545 3 1224979098644774912 17 0 1750 2 1224979098644774912 274 505 3 1224979098644774912 17 1 3 0 5 0 4 0 1702 1 1224979098644774912 33 3 1224979098644774913 60 69 2105 2 144115188075856116 1 2136 3 1224979098644774914 1 101 2147483680 2 1224979098644774914 4 1750 2 1224979098644774912 210 5 0 545 3 1224979098644774912 17 0 1750 2 1224979098644774912 184 505 3 1224979098644774912 17 1 3 0 3 0 3 0 
 1 4 100000000  1 1006 0  12 2133 2 144115188075856121 1 4 0 2136 3 72057594037927948 0 5 31 2 72057594037927948 0 31 2 144115188075855990 1 1 2 359 0 3 0 2385 2 1224979098644774912 0 2385 2 1224979098644774913 1 32 2 1224979098644774913 0 32 2 1224979098644774912 0 1106 1 216172782113783963 

diff --git a/scripts.txt b/scripts.txt
diff --git a/variable_uses.txt b/variable_uses.txt
@@ -680,7 +680,7 @@
 10
 3
 1
-13
+14
 3
 2
 7