Change the way we handle bad heroes, respawning, and zone control padding/margin (#432)

Author: chrisinajar

game/scripts/vscripts/components/duels/duels.lua

@@ -111,22 +111,24 @@ function Duels:ActuallyStartDuel ()
     local player = PlayerResource:GetPlayer(playerId)
     if player ~= nil then
       DebugPrint ('Players team ' .. player:GetTeam())
-      if player:GetTeam() == 3 then
-        badPlayers[badPlayerIndex] = Duels:SavePlayerState(player:GetAssignedHero())
-        badPlayers[badPlayerIndex].id = playerId
-        -- used to generate keynames like badEnd1
-        -- not used in dota apis
-        badPlayers[badPlayerIndex].team = 'bad'
-        badPlayerIndex = badPlayerIndex + 1
-
-      elseif player:GetTeam() == 2 then
-        goodPlayers[goodPlayerIndex] = Duels:SavePlayerState(player:GetAssignedHero())
-        goodPlayers[goodPlayerIndex].id = playerId
-        goodPlayers[goodPlayerIndex].team = 'good'
-        goodPlayerIndex = goodPlayerIndex + 1
+      if player:GetAssignedHero() then
+        if player:GetTeam() == 3 then
+          badPlayers[badPlayerIndex] = Duels:SavePlayerState(player:GetAssignedHero())
+          badPlayers[badPlayerIndex].id = playerId
+          -- used to generate keynames like badEnd1
+          -- not used in dota apis
+          badPlayers[badPlayerIndex].team = 'bad'
+          badPlayerIndex = badPlayerIndex + 1
+
+        elseif player:GetTeam() == 2 then
+          goodPlayers[goodPlayerIndex] = Duels:SavePlayerState(player:GetAssignedHero())
+          goodPlayers[goodPlayerIndex].id = playerId
+          goodPlayers[goodPlayerIndex].team = 'good'
+          goodPlayerIndex = goodPlayerIndex + 1
+        end
+
+        Duels:ResetPlayerState(player:GetAssignedHero())
       end
-
-      Duels:ResetPlayerState(player:GetAssignedHero())
     end
   end
 
@@ -270,8 +272,14 @@ function Duels:EndDuel ()
     Duels.zone1.removePlayer(playerId)
     Duels.zone2.removePlayer(playerId)
     local player = PlayerResource:GetPlayer(playerId)
-    if player ~= nil then
-      player:GetAssignedHero():SetRespawnsDisabled(false)
+    if player ~= nil and player:GetAssignedHero() then
+      local hero = player:GetAssignedHero()
+      if hero then
+        hero:SetRespawnsDisabled(false)
+        if not hero:IsAlive() then
+          hero:RespawnHero(false,false,false)
+        end
+      end
     end
   end
 
@@ -304,7 +312,7 @@ function Duels:ResetPlayerState (hero)
   hero:SetMana(hero:GetMaxMana())
 
   -- Reset cooldown for abilities
-  for abilityIndex = 0,hero:GetAbilityCount() do
+  for abilityIndex = 0,hero:GetAbilityCount() - 1 do
     local ability = hero:GetAbilityByIndex(abilityIndex)
     if ability ~= nil then
       ability:EndCooldown()

game/scripts/vscripts/components/zonecontrol/zones.lua

@@ -59,7 +59,9 @@ function ZoneControl:CreateEmptyState (options)
   return {
     isZoneControlState = true,
     mode = options.mode,
-    players = options.players
+    players = options.players,
+    padding = options.padding or 100,
+    margin = options.margin or 100
   }
 end
 
@@ -272,19 +274,19 @@ function ZoneControl:EnforceRulesOnEntity (state, playerId, entity)
         -- we're snapping to an X wall
         if xDistance > 0 then
           -- we're snapping to the right wall
-          origin = Vector(state.bounds.Maxs.x + bounds.Maxs.x + 20 + state.origin.x, origin.y, origin.z)
+          origin = Vector(state.bounds.Maxs.x + bounds.Maxs.x + state.margin + state.origin.x, origin.y, origin.z)
         else
           -- we're snapping to the left wall
-          origin = Vector(state.bounds.Mins.x + bounds.Mins.x - 20 + state.origin.x, origin.y, origin.z)
+          origin = Vector(state.bounds.Mins.x + bounds.Mins.x - state.margin + state.origin.x, origin.y, origin.z)
         end
       else
         -- we're snapping to a Y wall
         if yDistance > 0 then
           -- we're snapping to the top wall
-          origin = Vector(origin.x, state.bounds.Maxs.y + bounds.Maxs.y + 20 + state.origin.y, origin.z)
+          origin = Vector(origin.x, state.bounds.Maxs.y + bounds.Maxs.y + state.margin + state.origin.y, origin.z)
         else
           -- we're snapping to the bottom wall
-          origin = Vector(origin.x, state.bounds.Mins.y + bounds.Mins.y - 20 + state.origin.y, origin.z)
+          origin = Vector(origin.x, state.bounds.Mins.y + bounds.Mins.y - state.margin + state.origin.y, origin.z)
         end
       end
     end
@@ -293,10 +295,10 @@ function ZoneControl:EnforceRulesOnEntity (state, playerId, entity)
       DebugPrint('Player is not touching, but should be!')
       local x = origin.x
       local y = origin.y
-      local topWall = state.origin.y + state.bounds.Maxs.y
-      local rightWall = state.origin.x + state.bounds.Maxs.x
-      local bottomWall = state.origin.y + state.bounds.Mins.y
-      local leftWall = state.origin.x + state.bounds.Mins.x
+      local topWall = state.origin.y + state.bounds.Maxs.y - state.padding
+      local rightWall = state.origin.x + state.bounds.Maxs.x + state.padding
+      local bottomWall = state.origin.y + state.bounds.Mins.y + state.padding
+      local leftWall = state.origin.x + state.bounds.Mins.x - state.padding
 
       if x > rightWall then
         x = rightWall