Фиксы ошибок в режимах

lex128 · Aug 15, 2017 · 09cb49a · 09cb49a
1 parent 085a7ce
commit 09cb49a
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 25 deletions.
diff --git a/modes/arena.lua b/modes/arena.lua
@@ -5,7 +5,7 @@
 *  РАЗРАБОТЧИКИ:  Александр Романов <lexr128@gmail.com>
 *
 ****************************************************************************]]
-spawnCounter = {}
+local spawnCounter = {}
 function TeamDeathMatch_onResourceStart (resource)
 	createTacticsMode ("arena", {timelimit="10:00", spawnprotect="0:05"})
 end

diff --git a/modes/bang.lua b/modes/bang.lua
@@ -5,8 +5,8 @@
 *  РАЗРАБОТЧИКИ:  Александр Романов <lexr128@gmail.com>
 *
 ****************************************************************************]]
-ProjectBang_vehicles = {}
-spawnCounter = {}
+local ProjectBang_vehicles = {}
+local spawnCounter = {}
 function ProjectBang_onResourceStart(resource)
 	createTacticsMode("bang",{timelimit="10:00",player_radarblip="all|none,team,all"})
 end

diff --git a/modes/base.lua b/modes/base.lua
@@ -5,8 +5,8 @@
 *  РАЗРАБОТЧИКИ:  Александр Романов <lexr128@gmail.com>
 *
 ****************************************************************************]]
-captureTimer = false
-spawnCounter = {}
+local captureTimer = false
+local spawnCounter = {}
 function AttackDefend_onResourceStart(resource)
 	createTacticsMode("base",{timelimit="15:00",capturing="0:20",def_veh_jacking="false",spawnprotect="0:15"})
 end

diff --git a/modes/bomb.lua b/modes/bomb.lua
@@ -5,9 +5,9 @@
 *  РАЗРАБОТЧИКИ:  Александр Романов <lexr128@gmail.com>
 *
 ****************************************************************************]]
-spawnCounter = {}
-teamPlanted = false
-playerPlanted = false
+local spawnCounter = {}
+local teamPlanted = false
+local playerPlanted = false
 function BombMatch_onResourceStart(resource)
 	createTacticsMode("bomb",{timelimit="15:00",bombtimer="1:50",planting="0:05",defusing="0:10",spawnprotect="0:05"})
 end

diff --git a/modes/cp.lua b/modes/cp.lua
@@ -5,10 +5,10 @@
 *  РАЗРАБОТЧИКИ:  Александр Романов <lexr128@gmail.com>
 *
 ****************************************************************************]]
-captureTimer = {}
-captureBase = {}
-captureTeam = {}
-spawnCounter = {}
+local captureTimer = {}
+local captureBase = {}
+local captureTeam = {}
+local spawnCounter = {}
 function ControlPoints_onResourceStart(resource)
 	createTacticsMode("cp",{timelimit="7:30",capturing_1="0:15",capturing_2="0:12",capturing_more="0:10",spawnprotect="0:03"})
 end

diff --git a/modes/ctf.lua b/modes/ctf.lua
@@ -5,7 +5,7 @@
 *  РАЗРАБОТЧИКИ:  Александр Романов <lexr128@gmail.com>
 *
 ****************************************************************************]]
-spawnCounter = {}
+local spawnCounter = {}
 local flagRespawn = {}
 local teamFlag = {}
 local playerFlag = {}

diff --git a/modes/derby.lua b/modes/derby.lua
@@ -12,7 +12,7 @@ local playerVehicle = {}
 local startTick = 0
 local pauseTick = 0
 local replaceModels = {nitro = 2221,repair = 2222,vehiclechange = 2223}
-finishCounter = {}
+local finishCounter = {}
 function DestructionDerby_onResourceStart(resource)
 	createTacticsMode("derby",{timelimit="30:00",type_play="individual|individual,teamplay",disable_weapons="false",player_radarblip="all|none,team,all",firewater="false"})
 end

diff --git a/modes/dm.lua b/modes/dm.lua
@@ -49,7 +49,7 @@ function DeathMatch_onRoundStart()
 	local spawnprotect = TimeToSec(getRoundModeSettings("spawnprotect"))
 	local teamsides = getTacticsData("Teamsides")
 	for i,player in ipairs(getElementsByType("player")) do
-		if (getPlayerGameStatus(player,"Status") == "Play" or getElementData(player) == "Loading") then
+		if getPlayerGameStatus(player) == "Play" or getPlayerGameStatus(player) == "Loading" then
 			givePlayerProperty(player,"invulnerable",true,spawnprotect*1000)
 			local team = getPlayerTeam(player)
 			if (teamsides[team]) then
@@ -126,8 +126,10 @@ function DeathMatch_onCheckRound(killer,frags)
 	local fraglimit = tonumber(getRoundModeSettings("fraglimit") or 50)
 	local players = {}
 	for i,player in ipairs(getElementsByType("player")) do
-		local frags = getElementData(player,"Frags") or 0
-		table.insert(players,{player,frags})
+		if getPlayerGameStatus(player) == "Play" then
+			local frags = getElementData(player,"Frags") or 0
+			table.insert(players,{player,frags})
+		end
 	end
 	table.sort(players,function(a,b) return a[2] > b[2] end)
 	if (players[1][2] >= fraglimit) then
@@ -154,8 +156,10 @@ end
 function DeathMatch_onRoundTimesup()
 	local players = {}
 	for i,player in ipairs(getElementsByType("player")) do
-		local frags = getElementData(player,"Frags") or 0
-		table.insert(players,{player,frags})
+		if getPlayerGameStatus(player) == "Play" then
+			local frags = getElementData(player,"Frags") or 0
+			table.insert(players,{player,frags})
+		end
 	end
 	if (#players > 0) then table.sort(players,function(a,b) return a[2] > b[2] end) end
 	if (#players > 0 and players[1][2] > players[2][2]) then

diff --git a/modes/fly.lua b/modes/fly.lua
@@ -5,8 +5,8 @@
 *  РАЗРАБОТЧИКИ:  Александр Романов <lexr128@gmail.com>
 *
 ****************************************************************************]]
-spawnCounter = {}
-playerPlane = {}
+local spawnCounter = {}
+local playerPlane = {}
 function FlyMatch_onResourceStart(resource)
 	createTacticsMode("fly",{timelimit="10:00",player_radarblip="all|none,team,all",spawn_into_plane="none|none,rustler,hydra,hunter,seasparrow,rc baron"})
 end

diff --git a/modes/hostage.lua b/modes/hostage.lua
@@ -5,7 +5,7 @@
 *  РАЗРАБОТЧИКИ:  Александр Романов <lexr128@gmail.com>
 *
 ****************************************************************************]]
-spawnCounter = {}
+local spawnCounter = {}
 function Hostage_onResourceStart(resource)
 	createTacticsMode("hostage",{timelimit="30:00",hostagekill="false", spawnprotect="0:05"})
 end

diff --git a/modes/vip.lua b/modes/vip.lua
@@ -5,8 +5,8 @@
 *  РАЗРАБОТЧИКИ:  Александр Романов <lexr128@gmail.com>
 *
 ****************************************************************************]]
-spawnCounter = {}
-playerVIP = nil
+local spawnCounter = {}
+local playerVIP = nil
 function VeryImportantPerson_onResourceStart(resource)
 	createTacticsMode("vip",{timelimit="10:00", spawnprotect="0:05"})
 end

diff --git a/modes/zombie.lua b/modes/zombie.lua
@@ -5,7 +5,7 @@
 *  РАЗРАБОТЧИКИ:  Александр Романов <lexr128@gmail.com>
 *
 ****************************************************************************]]
-infectionTimer = false
+local infectionTimer = false
 function ZombieMod_onResourceStart(resource)
 	createTacticsMode("zombie",{timelimit="10:00",zombie_speed="1.2",zombie_regenerate="5",night="true",spawnprotect="0:15"})
 end