fix human cannot build ROCKET_TANK (#275)

SMUnlimited · Mar 9, 2024 · 8e3b2f0 · 8e3b2f0
1 parent 355f4d8
commit 8e3b2f0
Show file tree

Hide file tree

Showing 4 changed files with 480 additions and 447 deletions.
diff --git a/REFORGED/Human/BuildSequence.ai b/REFORGED/Human/BuildSequence.ai
@@ -173,12 +173,16 @@ function global_build_sequence takes nothing returns nothing
 		call AddUnitToAntiair(RIFLEMAN,5)
 		call AddUnitToAntiair(COPTER,2+GetUpgradeLevel(old_id[UPG_FLAK]))
 		call AddUnitToAntiair(HUMAN_DRAGON_HAWK,5)
-		call AddUnitToAntiair(STEAM_TANK,GetUpgradeLevel(old_id[UPG_TANK]))
+		call AddUnitToAntiair(ROCKET_TANK,GetUpgradeLevel(old_id[UPG_TANK]))
 		call AddUnitToAnticasters(SPELL_BREAKER,5+GetUpgradeLevel(old_id[UPG_CONT_MAGIC]))
 		call AddUnitToAnticasters(PRIEST,1)
 		call AddUnitToAntitowers(MORTAR,6)
 		call AddUnitToAntitowers(HUMAN_DRAGON_HAWK,1)
-		call AddUnitToAntitowers(STEAM_TANK,2)
+		if GetUpgradeLevel(UPG_TANK) > 0 then
+			call AddUnitToAntitowers(ROCKET_TANK,2)
+		else
+			call AddUnitToAntitowers(TANK,2)
+		endif
 		call AddUnitToAntitowers(COPTER,2*GetUpgradeLevel(old_id[UPG_BOMBS]))
 		call AddUnitToAntipiercing(SPELL_BREAKER, 7)
 		call AddUnitToAntipiercing(RIFLEMAN, 3)
@@ -361,7 +365,6 @@ if tier == 3 then
       call BuildUnit(7, KNIGHT, 55)
       call BuildUnit(3, SORCERESS, 40)
       call BuildUnit(3, PRIEST, 40)
-      call BuildUpgr(1, UPG_TANK, 115)
       call BuildUpgr(2, UPG_SORCERY, 58)
       call BuildUpgr(2, UPG_PRAYING, 58)
       call BuildUpgr(1, UPG_BREEDING, 58)
@@ -777,7 +780,6 @@ if tier == 3 then
 
       call BuildUpgr(1, UPG_HAMMERS, 55)
       call BuildUpgr(1, UPG_BREEDING, 55)
-      call BuildUpgr(1, UPG_TANK, 115)
       call BuildUpgr(2, UPG_PRAYING, 58)
 
 
@@ -1226,7 +1228,11 @@ function build_sequence_Copters takes nothing returns nothing
 if tier == 3 then
 
       call BuildUnit(50, COPTER, 45)
-      call BuildUnit(8, STEAM_TANK, 65)
+      if GetUpgradeLevel(UPG_TANK) > 0 then
+        call BuildUnit(8, ROCKET_TANK, 65)
+      else
+        call BuildUnit(8, TANK, 65)
+      endif
       call BuildUnit(1, hero[1], 140)
       call BuildUnit(1, hero[2], 130)
       call BuildUnit(1, hero[3], 120)
@@ -1550,7 +1556,6 @@ if tier == 3 then
 
       call BuildUpgr(1, UPG_BREEDING, 105)
       call BuildUpgr(1, UPG_HAMMERS, 105)
-      call BuildUpgr(1, UPG_TANK, 85)
 
 
 
@@ -1690,7 +1695,11 @@ if tier == 3 then
 
       call SetBuildReact(36, 2, KNIGHT, 6, RIFLEMAN, (enemy_unarmored + (enemy_air * 2) + enemy_magic - (enemy_normal * 2)), 4, 25, 60)
       call SetBuildReact(12, 0, MORTAR, 0, COPTER, (enemy_unarmored + (enemy_air * 4) - (enemy_piercing * 4)), 4, 25, 55)
-      call SetBuildReact(22, 1, KNIGHT, 0, TANK, ((enemy_towers * 2) + enemy_air - (enemy_siege * 3) - enemy_normal), 4, 25, 50)
+      if GetUpgradeLevel(UPG_TANK) > 0 then
+        call SetBuildReact(22, 1, KNIGHT, 0, ROCKET_TANK, ((enemy_towers * 2) + enemy_air - (enemy_siege * 3) - enemy_normal), 4, 25, 50)
+      else
+        call SetBuildReact(22, 1, KNIGHT, 0, TANK, ((enemy_towers * 2) + enemy_air - (enemy_siege * 3) - enemy_normal), 4, 25, 50)
+      endif
       call BuildUnit(1, hero[1], 140)
       call BuildUnit(1, hero[2], 130)
       call BuildUnit(1, hero[3], 120)
@@ -1977,7 +1986,11 @@ endfunction
 
 
 function init_strategy_HAntiTower takes nothing returns nothing
-    call AddHarass(2, 3, TANK)
+    if GetUpgradeLevel(UPG_TANK) > 0 then
+      call AddHarass(2, 3, ROCKET_TANK)
+    else
+      call AddHarass(2, 3, TANK)
+    endif
     call AddHarass(2, 3, MORTAR)
     set distraction_group = 2
 
@@ -2025,7 +2038,11 @@ endfunction
 function build_sequence_HAntiTower takes nothing returns nothing
 if tier == 3 then
 
-      call BuildUnit(5, TANK, 50)
+      if GetUpgradeLevel(UPG_TANK) > 0 then
+        call BuildUnit(6, ROCKET_TANK, 65)
+      else
+        call BuildUnit(6, TANK, 65)
+      endif
       call BuildUnit(8, MORTAR, 60)
       call BuildUnit(8, KNIGHT, 55)
       call BuildUnit(1, hero[1], 140)
@@ -2075,8 +2092,8 @@ if tier == 3 then
 
 elseif tier == 2 then
 
-      call BuildUnit(8, MORTAR, 60)
-      call BuildUnit(8, FOOTMAN, 60)
+      call BuildUnit(10, MORTAR, 60)
+      call BuildUnit(14, FOOTMAN, 60)
       call BuildUnit(1, CASTLE, 55)
       call BuildUnit(1, hero[1], 140)
       call BuildUnit(1, hero[2], 130)

diff --git a/REFORGED/StandardUnits.txt b/REFORGED/StandardUnits.txt
@@ -16,7 +16,7 @@ PRIEST	hmpr	HUMAN	0	UNIT	SANCTUM	0	0	0	0	true	0	0	0	0	0	0	2	0	0	0	0	2	2	0	0	0
 RIFLEMAN	hrif	HUMAN	0	UNIT	BARRACKS	BLACKSMITH	0	0	0	true	0	0	0	0	0	0	0	0	3	0	0	0	0	0	3	0
 SORCERESS	hsor	HUMAN	0	UNIT	SANCTUM	0	0	0	0	true	0	0	0	0	0	0	2	0	0	0	0	2	2	0	0	0
 STEAM_TANK	hmtt	HUMAN	siege	UNIT	WORKSHOP	CASTLE	0	0	0	true	0	0	0	0	0	0	0	1	0	0	3	0	0	0	0	0
-ROCKET_TANK	hrrt	HUMAN	siege	UNIT	WORKSHOP	CASTLE	0	0	0	true	0	0	0	0	0	0	0	1	0	0	3	0	0	0	0	0
+ROCKET_TANK	hrtt	HUMAN	siege	UNIT	WORKSHOP	CASTLE	0	0	0	true	0	0	0	0	0	0	0	1	0	0	3	0	0	0	0	0
 MILITIA	hmil	HUMAN	militia,mutated	UNIT	0	0	0	PEASANT	0	false	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	1
 SPELL_BREAKER	hspt	HUMAN	0	UNIT	SANCTUM	KEEP	ARCANE_VAULT	0	0	true	0	0	0	0	0	0	0	0	0	3	0	0	0	0	3	0
 HUMAN_DRAGON_HAWK	hdhw	HUMAN	0	UNIT	AVIARY	ARCANE_VAULT	0	0	0	true	0	0	0	0	0	3	0	0	3	0	0	0	0	3	0	0

diff --git a/TFT/Human/BuildSequence.ai b/TFT/Human/BuildSequence.ai
@@ -178,12 +178,16 @@ function global_build_sequence takes nothing returns nothing
 		call AddUnitToAntiair(RIFLEMAN,5)
 		call AddUnitToAntiair(COPTER,2+GetUpgradeLevel(old_id[UPG_FLAK]))
 		call AddUnitToAntiair(HUMAN_DRAGON_HAWK,5)
-		call AddUnitToAntiair(STEAM_TANK,GetUpgradeLevel(old_id[UPG_TANK]))
+		call AddUnitToAntiair(ROCKET_TANK,GetUpgradeLevel(old_id[UPG_TANK]))
 		call AddUnitToAnticasters(SPELL_BREAKER,5)
 		call AddUnitToAnticasters(PRIEST,1)
 		call AddUnitToAntitowers(MORTAR,6)
 		call AddUnitToAntitowers(HUMAN_DRAGON_HAWK,1)
-		call AddUnitToAntitowers(STEAM_TANK,2)
+		if GetUpgradeLevel(UPG_TANK) > 0 then
+			call AddUnitToAntitowers(ROCKET_TANK,2)
+		else
+			call AddUnitToAntitowers(TANK,2)
+		endif
 		call AddUnitToAntitowers(COPTER,2*GetUpgradeLevel(old_id[UPG_BOMBS]))
 		call AddUnitToAntipiercing(SPELL_BREAKER, 7)
 		call AddUnitToAntipiercing(RIFLEMAN, 3)
@@ -1709,7 +1713,11 @@ if tier == 3 then
 
       call SetBuildReact(40, 2, KNIGHT, 6, RIFLEMAN, (enemy_unarmored + (enemy_air * 2) + enemy_magic - (enemy_normal * 2)), 4, 25, 60)
       call SetBuildReact(10, 0, MORTAR, 0, COPTER, (enemy_unarmored + (enemy_air * 4) - (enemy_piercing * 4)), 4, 25, 55)
-      call SetBuildReact(20, 1, KNIGHT, 0, TANK, ((enemy_towers * 2) + enemy_air - (enemy_siege * 3) - enemy_normal), 4, 25, 50)
+      if GetUpgradeLevel(UPG_TANK) > 0 then
+        call SetBuildReact(20, 1, KNIGHT, 0, ROCKET_TANK, ((enemy_towers * 2) + enemy_air - (enemy_siege * 3) - enemy_normal), 4, 25, 50)
+      else
+        call SetBuildReact(20, 1, KNIGHT, 0, TANK, ((enemy_towers * 2) + enemy_air - (enemy_siege * 3) - enemy_normal), 4, 25, 50)
+      endif
       call BuildUnit(1, hero[1], 90)
       call BuildUnit(1, hero[2], 60)
       call BuildUpgr(Min((((TownCountDone(FOOTMAN)) + TownCountDone(KNIGHT))/4),3), UPG_MELEE, 60)
@@ -1996,7 +2004,11 @@ endfunction
 
 
 function init_strategy_HAntiTower takes nothing returns nothing
-    call AddHarass(2, 3, TANK)
+    if GetUpgradeLevel(UPG_TANK) > 0 then
+      call AddHarass(2, 3, ROCKET_TANK)
+    else
+      call AddHarass(2, 3, TANK)
+    endif
     call AddHarass(2, 3, MORTAR)
     set distraction_group = 2
 
@@ -2044,8 +2056,13 @@ endfunction
 function build_sequence_HAntiTower takes nothing returns nothing
 if tier == 3 then
 
-      call BuildUnit(8, TANK, 50)
-      call BuildUnit(12, MORTAR, 60)
+      if GetUpgradeLevel(UPG_TANK) > 0 then
+        call BuildUnit(6, ROCKET_TANK, 65)
+      else
+        call BuildUnit(6, TANK, 65)
+      endif
+      call BuildUnit(8, MORTAR, 60)
+      call BuildUnit(8, KNIGHT, 55)
       call BuildUnit(1, hero[1], 90)
       call BuildUnit(1, hero[2], 60)
       call BuildUnit(1, ARCANE_VAULT, 45)
@@ -2091,12 +2108,11 @@ if tier == 3 then
 
 elseif tier == 2 then
 
-      call BuildUnit(5, TANK, 50)
       call BuildUnit(10, MORTAR, 60)
+      call BuildUnit(14, FOOTMAN, 60)
       call BuildUnit(1, CASTLE, 45)
       call BuildUnit(1, hero[1], 80)
       call BuildUnit(1, hero[2], 40)
-      call BuildUnit(1, ARCANE_VAULT, 55)