TR

Commands.txt

@@ -22,7 +22,7 @@ BUILD	FARMS		24	-4	-1	-1	Build	66	Farms	70	#	0	I will build farms now.
 BUILD	TOWERS		25	-4	-1	-1	Build	66	Towers	84	#	0	I will build towers now.
 ATTACK	HERE		13	0	-30	-31	Attack/Guard	65	Current screen	67		0	I will Attack/Guard the location of current screen position.
 ATTACK	SELECT		16	-40	-1	-1	Attack/Guard	65	Selected unit	83		0	I will Attack/Guard the currently selected unit.
-ATTACK	TOWERRUSH		17	-1	-1	-1	Attack/Guard	65	Towerrush (Orc only)	84		0	
+ATTACK	TOWERRUSH		17	-1	-1	-1	Attack/Guard	65	Towerrush	84		0	I will prepare to execute command towerrush.	
 ATTACK			12	-103	-1	-1	Attack/Guard	65	Enemy	69	e	0	I will Attack/Guard the specified player.
 	START		33	-1	-1	-1	Queue	81	Start/Restart	83		0	I have Started or Restarted your Queued commands.
 	RESTART		33	-1	-1	-1		0		0		0	I have Started or Restarted your Queued commands.

Jobs.txt

@@ -31,15 +31,15 @@ ARMY_TRACK	30	ArmyTrackJob()	false	50	60
 TOWN_TRACK	15	TownTrackJob()	true	50	60
 MILITIA_CHECK	10	MilitiaCheckJob()	race_militia_available	80	90
 TOWER_RUSH	10	TowerRushJob()	false	0	0
-TOWER_RUSH_CHECK	30	TowerRushCheck()	race_towerrush_available	0	10
+TOWER_RUSH_CHECK	30	TowerRushCheck(par)	false	0	10
 ANCIENT_EXPANSION	6	AncientExpansionJob()	false	0	0
 ANCIENT_EXPANSION_CHECK	30	AncientExpansionCheck()	race_ancient_expansion_available	10	20
 CHAT_VARS	15	ChatVarsJob()	true	1	2
 SELL_ZIGGURATS	4	SellZigguratJob()	race_sell_ziggurats	300	400
 FOCUSFIRE_CONTROL	10	FocusFireJob()	true	40	60
 MOON_WELL_CONTROL	20	MoonWellJob(unit_par, par)	false	0	0
 FAST_BUILD	10	FastBuild()	race_has_power_build	10	20
-MILITIA_EXPAND	10	TryMilitiaExpansionFoot()	militia	40	50
+MILITIA_EXPAND	10	TryMilitiaExpansionFoot()	race_militia_expansion_available	40	50
 SEND_HOME	20	SendUnitHomeJob(unit_par, par)	false	0	0
 RESET_WINDWALKER	9	ResetWindWalkerGuardPosition(unit_par)	false	0	0
 BUILD_EXPANSION	10	BuildExpansionJob(unit_par)	false	0	0

Jobs/BUILD_EXPANSION.eai

@@ -1,32 +1,32 @@
-#IFDEF GLOBAL
-#ELSE
-
-
-// Extra prevention against AMAI building two townhalls at the same location
-// GetotherExpansionNearby dosn't yet detect haunted mines so they are still the exception
-function BuildExpansionJob takes unit u returns nothing
-	local unit v = null
-  local player p = null
-		if UnitAlive(u) == false then
-			return
-		endif
-		set v = GetOtherExpansionNearby(v,GetUnitX(current_expansion), GetUnitY(current_expansion))
-		if v != null then
-      set p = GetOwningPlayer(v)
-      if IsPlayerEnemy(ai_player, p) then
-        call Trace("Cancelling Expansion - Enemy double expansion detected")
-        call IssueImmediateOrder(u, "stop")
-      elseif IsPlayerAlly(ai_player, p) and GetTotalClaimedMinesNearby(v, GetUnitX(u), GetUnitY(u)) >= GetTotalMinesNearby(v, GetUnitX(u), GetUnitY(u)) then
-        call Trace("Cancelling Expansion - Enemy ally expansion detected")
-        call IssueImmediateOrder(u, "stop")
-      endif
-			set v = null
-			return
-		endif
-		if DistanceBetweenUnits(u, current_expansion) > race_max_expa_mine_distance then
-			call TQAddUnitJob(2 * sleep_multiplier, BUILD_EXPANSION, 0, u)
-		endif
-
-endfunction
-
-#ENDIF
+#IFDEF GLOBAL
+#ELSE
+
+
+// Extra prevention against AMAI building two townhalls at the same location
+// GetotherExpansionNearby dosn't yet detect haunted mines so they are still the exception
+function BuildExpansionJob takes unit u returns nothing
+	local unit v = null
+  local player p = null
+		if UnitAlive(u) == false then
+			return
+		endif
+		set v = GetOtherExpansionNearby(v,GetUnitX(current_expansion), GetUnitY(current_expansion))
+		if v != null then
+      set p = GetOwningPlayer(v)
+      if IsPlayerEnemy(ai_player, p) then
+        call Trace("Cancelling Expansion - Enemy double expansion detected")
+        call IssueImmediateOrder(u, "stop")
+      elseif IsPlayerAlly(ai_player, p) and GetTotalClaimedMinesNearby(v, GetUnitX(u), GetUnitY(u)) >= GetTotalMinesNearby(v, GetUnitX(u), GetUnitY(u)) then
+        call Trace("Cancelling Expansion - Enemy ally expansion detected")
+        call IssueImmediateOrder(u, "stop")
+      endif
+			set v = null
+			return
+		endif
+		if DistanceBetweenUnits(u, current_expansion) > race_max_expa_mine_distance then
+			call TQAddUnitJob(2 * sleep_multiplier, BUILD_EXPANSION, 0, u)
+		endif
+
+endfunction
+
+#ENDIF

Jobs/DETECT_DEFEAT.eai

@@ -23,7 +23,7 @@ function SaveYourself takes nothing returns boolean
       set ancient_expanding = true
       set SaveYourselfMode = ANCIENT_EXPANSION
       return true
-    elseif race_militia_available == true then
+    elseif race_militia_expansion_available == true and not militia_expanding then
       call TQAddJob(2, MILITIA_EXPAND, 0)
       set SaveYourselfMode = MILITIA_EXPAND
       return true
@@ -37,7 +37,9 @@ function SaveYourself takes nothing returns boolean
         return true
       endif
     elseif SaveYourselfMode == MILITIA_EXPAND then
-      if not HallsCompleted(racial_expansion) or GetMinesOwned() > 0 then
+      if militia_expanding then
+        return true  // In self rescue, wait
+      elseif not HallsCompleted(racial_expansion) or GetMinesOwned() > 0 then
         set SaveYourselfMode = -1
         return true
       endif

Jobs/MILITIA_CHECK.eai

@@ -43,7 +43,7 @@ function MilitiaCheckJob takes nothing returns nothing
   if militia_hall == null or GetUnitState(militia_hall, UNIT_STATE_LIFE) <= 0 then
     set militia_hall = GetMilitiaHall(militia_hall)
   endif
-  if race_militia_available and (militia_hall == null or towerrush) then
+  if race_militia_available and militia_hall == null then
     call TQAddJob(30, MILITIA_CHECK, 0)
     return
   endif

Jobs/MILITIA_EXPAND.eai

@@ -1,7 +1,7 @@
 #IFDEF GLOBAL
 
 boolean militia_expanding = false
-boolean militia = true
+//boolean militia = true
 integer militia_time_count = 0
 integer militia_time_out = 100  // value * 3 seconds
 integer militia_state = 0

Jobs/NEUTRAL_GUARDED.eai

@@ -2,12 +2,12 @@
 #ELSE
 function NeutralGuardedJob takes integer nn returns nothing
   call DisplayToAllJobDebug("NEUTRAL_GUARDED JOB START")
-  set neutral_guarded[nn] = GetNeutralGuard(nn)
+  call GetNeutralGuard(nn)
   if not UnitAlive(nearest_neutral[nn]) then
     set nearest_neutral[nn] = GetNearestNeutralQuick(nearest_neutral[nn], neutral_id[nn])
   endif
   if neutral_guarded[nn] and not pathing_done and nearest_neutral[nn] != null then  // pathing_done give PathingThread continue check
     call TQAddJob(30 * sleep_multiplier, NEUTRAL_GUARDED, nn)
   endif
 endfunction
-#ENDIF
+#ENDIF

Jobs/SELL_ZIGGURATS.eai

@@ -1,6 +1,31 @@
 #IFDEF GLOBAL
+  location TRrecovery = null
+  unit sellbuild = null
+  unit sellpeon = null
 #ELSE
 
+function RecoveryTRBuild takes group g returns nothing
+  if sellbuild == null or not UnitAlive(sellbuild) then
+    call GroupEnumUnitsInRange(g, GetLocationX(TRrecovery), GetLocationY(TRrecovery), 2000, null)
+    set g = SelectByPlayer(g, ai_player, true)
+    set g = SelectUnittype(g, UNIT_TYPE_STRUCTURE, true)
+    set g = SelectByAlive(g, true)
+    set g = SelectByHidden(g, false)
+    set sellbuild = FirstOfGroup(g)
+  endif
+  if sellpeon == null or not UnitAlive(sellpeon) then
+    set sellpeon = GetExpansionPeon2(sellpeon)
+  endif
+  if sellbuild != null and sellpeon != null then
+    call IssueTargetOrder(sellpeon, "unsummon", sellbuild)
+  elseif sellbuild == null then
+    call RemoveLocation(TRrecovery)
+    set TRrecovery = null
+    set sellbuild = null
+    set sellpeon = null
+  endif
+endfunction
+
 function SelectByZiggurat takes group rg returns group
   local unit u = null
   local integer i = 0
@@ -13,11 +38,11 @@ function SelectByZiggurat takes group rg returns group
     loop
       exitwhen i > ziggarray
       if GetUnitTypeId(u) == racial_zigg[i] then
-        call GroupAddUnit(rg, u )
+        call GroupAddUnit(rg, u)
       endif
       set i = i + 1
     endloop
-    call GroupRemoveUnit(g, u )
+    call GroupRemoveUnit(g, u)
   endloop
   call DestroyGroup(g)
   set g = null
@@ -29,7 +54,10 @@ function CheckSellZiggurat takes unit u returns nothing
   call GroupEnumUnitsInRange(g, GetUnitX(u), GetUnitY(u), race_ziggurat_keep_distance, null)
   set g = SelectByPlayer(g, ai_player, true)
   set g = SelectUnittype(g, UNIT_TYPE_STRUCTURE, true)
-  if (BlzGroupGetSize(g) <= 1) then
+  set g = SelectByAlive(g, true)
+  set g = SelectByHidden(g, false)
+  call GroupRemoveUnit(g, FirstOfGroup(g))
+  if FirstOfGroup(g) == null then
     call Unsummon(u)
   endif
   call DestroyGroup(g)
@@ -39,19 +67,37 @@ endfunction
 function SellZigguratJob takes nothing returns nothing
   local group g = CreateGroup()
   local unit u = null
-  local integer i = 0
+  //local integer i = 0
 
   call DisplayToAllJobDebug("SELL_ZIGGURATS JOB START")
-  call GroupEnumUnitsOfPlayer(g, ai_player, null)
-  set g = SelectByZiggurat(g)
-  loop
-    set u = FirstOfGroup(g)
-    exitwhen u == null
-    call CheckSellZiggurat(u)
-    call GroupRemoveUnit(g,u)
-  endloop
+  if not towerrush then
+    if TRrecovery == null then
+      call GroupEnumUnitsOfPlayer(g, ai_player, null)
+      set g = SelectByAlive(g, true)
+      set g = SelectByHidden(g, false)
+      set g = SelectByZiggurat(g)
+      loop
+        set u = FirstOfGroup(g)
+        exitwhen u == null
+        call CheckSellZiggurat(u)
+        call GroupRemoveUnit(g,u)
+      endloop
+    else
+      if sellbuild != null and UnitAlive(sellbuild) and sellpeon != null and UnitAlive(sellpeon) then
+        call IssueTargetOrder(sellpeon, "unsummon", sellbuild)
+      else
+        call RecoveryTRBuild(g)
+      endif
+      call DestroyGroup(g)
+      set g = null
+      call TQAddJob(6, SELL_ZIGGURATS, 0)
+      return
+    endif
+  endif
   call DestroyGroup(g)
   set g = null
-  call TQAddJob(30, SELL_ZIGGURATS, 0)
+  if not pathing_done then
+    call TQAddJob(30, SELL_ZIGGURATS, 0)
+  endif
 endfunction
-#ENDIF
+#ENDIF