Random fixes (#556)

* Fix duels being dumb and super enforce zones * Fix zone control, fix duel zones, fix double respawn * Languages
OpenAngelArena · Apr 15, 2017 · 5c14ce2 · 5c14ce2
1 parent f19a269
commit 5c14ce2
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 20 deletions.
diff --git a/content/maps/oaa.vmap b/content/maps/oaa.vmap
diff --git a/content/materials/overviews/oaa.tga b/content/materials/overviews/oaa.tga
diff --git a/game/resource/addon_english.txt b/game/resource/addon_english.txt
diff --git a/game/resource/addon_german.txt b/game/resource/addon_german.txt
diff --git a/game/resource/addon_portuguese.txt b/game/resource/addon_portuguese.txt
diff --git a/game/resource/addon_russian.txt b/game/resource/addon_russian.txt
diff --git a/game/scripts/vscripts/components/duels/duels.lua b/game/scripts/vscripts/components/duels/duels.lua
@@ -22,14 +22,16 @@ function Duels:Init ()
   Duels.currentDuel = nil
   Duels.zone1 = ZoneControl:CreateZone('duel_1', {
     mode = ZONE_CONTROL_INCLUSIVE,
-    margin = 200,
+    margin = 500,
+    padding = 200,
     players = {
     }
   })
 
   Duels.zone2 = ZoneControl:CreateZone('duel_2', {
     mode = ZONE_CONTROL_INCLUSIVE,
-    margin = 200,
+    margin = 500,
+    padding = 200,
     players = {
     }
   })
@@ -275,16 +277,6 @@ function Duels:EndDuel ()
   for playerId = 0,19 do
     Duels.zone1.removePlayer(playerId, false)
     Duels.zone2.removePlayer(playerId, false)
-    local player = PlayerResource:GetPlayer(playerId)
-    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
 
   local currentDuel = Duels.currentDuel
@@ -296,11 +288,15 @@ function Duels:EndDuel ()
       DebugPrint('Is this a player id? ' .. state.id)
       local player = PlayerResource:GetPlayer(state.id)
       local hero = player:GetAssignedHero()
-      hero:SetRespawnsDisabled(false)
       if not hero:IsAlive() then
+        hero:SetRespawnsDisabled(false)
         hero:RespawnHero(false,false,false)
       end
 
+      if not state.assigned then
+        return
+      end
+
       Duels:RestorePlayerState (hero, state)
       Duels:MoveCameraToPlayer(state.id, hero)
     end)
@@ -336,7 +332,6 @@ function Duels:SavePlayerState (hero)
   local state = {
     location = hero:GetAbsOrigin(),
     abilityCount = hero:GetAbilityCount(),
-    maxAbility = 0,
     abilities = {},
     items = {},
     hp = hero:GetHealth(),
@@ -352,10 +347,9 @@ function Duels:SavePlayerState (hero)
     end
   end
 
-  for abilityIndex = 0,state.abilityCount-1 do
+  for abilityIndex = 0,hero:GetAbilityCount()-1 do
     local ability = hero:GetAbilityByIndex(abilityIndex)
     if ability ~= nil then
-      state.maxAbility = abilityIndex
       state.abilities[abilityIndex] = {
         cooldown = ability:GetCooldownTimeRemaining()
       }
@@ -381,7 +375,7 @@ function Duels:RestorePlayerState (hero, state)
   end
   hero:SetMana(state.mana)
 
-  for abilityIndex = 0,state.maxAbility-1 do
+  for abilityIndex = 0,hero:GetAbilityCount()-1 do
     local ability = hero:GetAbilityByIndex(abilityIndex)
     if ability ~= nil then
       ability:StartCooldown(state.abilities[abilityIndex].cooldown)

diff --git a/game/scripts/vscripts/components/zonecontrol/zones.lua b/game/scripts/vscripts/components/zonecontrol/zones.lua
@@ -107,6 +107,11 @@ function ZoneControl:CreateStateFromHandle (handle, options)
   handle:RedirectOutput('OnStartTouch', 'startTouchHandler', handle)
   handle:RedirectOutput('OnEndTouch', 'endTouchHandler', handle)
 
+  Timers:CreateTimer(5, function ()
+    ZoneControl:EnforceRules(state)
+    return 5
+  end)
+
   return state;
 end
 
@@ -214,7 +219,7 @@ end
 function ZoneControl:EnforceRulesOnPlayerId (state, playerId)
   local player = PlayerResource:GetPlayer(playerId)
 
-  if player then
+  if player and player:GetAssignedHero() then
     ZoneControl:EnforceRulesOnEntity(state, playerId, player:GetAssignedHero())
   end
 end
@@ -300,9 +305,9 @@ function ZoneControl:EnforceRulesOnEntity (state, playerId, entity)
       local x = origin.x
       local y = origin.y
       local topWall = state.origin.y + state.bounds.Maxs.y - state.padding
-      local rightWall = state.origin.x + state.bounds.Maxs.x + 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
+      local leftWall = state.origin.x + state.bounds.Mins.x + state.padding
 
       if x > rightWall then
         x = rightWall