hedgewars: comparison share/hedgewars/Data/Maps/Control/map.lua

equal deleted inserted replaced

-:ef0a76e154cb
+:30e374a27269
 --------------------------------
--- CONTROL 0.5
+-- CONTROL 0.6
 --------------------------------
 ---------
 -- 0.2
 ---------
 --------
 -- removed user branding
 -- fixed infinite attack time exploit
+--------
+-- 0.6
+--------
+-- timebox fix
+-- support for more players
+-- remove version numbers
+-- enable limited sudden death
+-- using skip go generates as many points as you would have gotten had you sat and waited
 -----------------
 --script begins
 -----------------
 loadfile(GetDataPath() .. "Scripts/Locale.lua")()
 --------------------------------
 --zone and teleporter variables
 --------------------------------
---local redTel
---local orangeTel
---local areaArr = {} -- no longer used
 local cPoint = {}
 local cOwnerClan = {}
 local zXMin = {}
 local zWidth = {}
 	for i = 0,(zCount-1) do
 		SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], 0xffffffff)
 		cOwnerClan[i] = nil
 		for k = 0, (numhhs-1) do
-			if (hhs[k] ~= nil) and (GetGearType(hhs[k]) ~= nil) then
+			if (hhs[k] ~= nil) then --and (GetGearType(hhs[k]) ~= nil) then
 if (GearIsInZone(hhs[k],i)) == true then
 if cOwnerClan[i] ~= nil then
 if cOwnerClan[i] ~= GetHogClan(hhs[k]) then
 --if the hog now being compared is different to one that is also here and was previously compared
 SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], GetClanColor( GetHogClan(hhs[k])))
 end
 end
-else hhs[k] = nil
+-- else hhs[k] = nil
 			end
 		end
 	end
 	-- i want to show all the tags at once as having the SAME score not 1,2,3,4 so alas, repeating the loop seems needed
 	for i = 0,(zCount-1) do
 		if CurrentHedgehog ~= nil then
 			if cOwnerClan[i] == GetHogClan(CurrentHedgehog) then
-				g = AddVisualGear(vCircX[i], vCircY[i], vgtHealthTag, 100, False)
+				g = AddVisualGear(vCircX[i], vCircY[i]-100, vgtHealthTag, 100, False)
 if g ~= 0 then
-				    SetVisualGearValues(g, vCircX[i], vCircY[i], 0, 0, 0, 0, 0, teamScore[cOwnerClan[i]], 1500, GetClanColor(cOwnerClan[i]))
+				    SetVisualGearValues(g, vCircX[i], vCircY[i]-100, 0, 0, 0, 0, 0, teamScore[cOwnerClan[i]], 1500, GetClanColor(cOwnerClan[i]))
 end
 			end
 		end
 	end
 function RebuildTeamInfo()
 	-- make a list of individual team names
-	for i = 0, 5 do
+	for i = 0, (TeamsCount-1) do
 		teamNameArr[i] = " " -- = i
 		teamSize[i] = 0
 		teamIndex[i] = 0
 		teamScore[i] = 0
 	end
 ------------------------
 -- game methods
 ------------------------
+function onAttack()
+	if CurrentHedgehog ~= nil then
+		if GetCurAmmoType() == amSkip then
+			z = (TurnTimeLeft / 2000) - (TurnTimeLeft / 2000)%2
+			--AddCaption("scored: " .. z,GetClanColor(GetHogClan(CurrentHedgehog)),capgrpMessage2)
+			for i = 0, z do
+				AwardPoints()
+			end
+		end
+	end
+end
 function onGameInit()
 	-- Things we don't modify here will use their default values.
 	--GameFlags = gfInfAttack + gfSolidLand -- Game settings and rules
 	GameFlags = band(bor(GameFlags, gfInfAttack + gfSolidLand), bnot(gfKing + gfForts))
+	WaterRise = 0
-	SuddenDeathTurns = 99 -- suddendeath is off, effectively
 end
 function onGameStart()
 	RebuildTeamInfo()
 	for i = 0, (numTeams-1) do
 		pointLimit = pointLimit - 25
 	end
-	--SetGearPosition(hhs[0], 631, 82)
-	--SetGearPosition(hhs[1], 1088, 684)
-	--SetGearPosition(hhs[2], 381, 1569)
 	-- reposition hogs if they are on control points until they are not or sanity limit kicks in
 	reN = 0
 	--zz = 0
 	while (reN < 10) do
 		if ZonesAreEmpty() == false then
 			reN = 15
 		end
 		--AddCaption(zz) -- number of times it took to work
 	end
-	ShowMission("CONTROL v0.3", "", loc("Control pillars to score points.") .. "|" .. loc("Goal") .. ": " .. pointLimit .. " " .. loc("points"), 0, 0)
+	ShowMission("CONTROL",
+	"",
+	loc("Control pillars to score points.") .. "|" ..
+	loc("Goal") .. ": " .. pointLimit .. " " .. loc("points"), 0, 0)
 end
 				end
 			end
 			TurnTimeLeft = 1
 		end
-		for i = 0,5 do
+		totalComment = ""
+		for i = 0,(TeamsCount-1) do
 				if teamNameArr[i] ~= " " then				-- i
 					teamComment[i] = teamNameArr[i] .. ": " .. teamScore[teamClan[i]] .. " " .. loc("points") .. "|"
+					totalComment = totalComment .. teamComment[i]
 				elseif teamNameArr[i] == " " then
 					teamComment[i] = "|"
 				end
 			end
-			ShowMission("CONTROL", loc("Team Scores") .. ":", teamComment[0] .. teamComment[1] .. teamComment[2] .. teamComment[3] .. teamComment[4] .. teamComment[5], 0, 1600)
+			ShowMission("CONTROL",
+			loc("Team Scores") .. ":",
+			totalComment, 0, 1600)
 	end
 end
 	vCircCount = vCircCount + 1
 	if (vCircCount >= 500) and (gameWon == false) then
 		vCircCount = 0
 		CheckZones()
-		--AwardPoints()
-		--[[for i = 0,5 do
-			if teamNameArr[i] ~= " " then				-- i
-				teamComment[i] = teamNameArr[i] .. ": " .. teamScore[teamClan[i] ] .. " points|"
-			elseif teamNameArr[i] == " " then
-				teamComment[i] = "|"
-			end
-		end
-		ShowMission("CONTROL", "Team Scores:", teamComment[0] .. teamComment[1] .. teamComment[2] .. teamComment[3] .. teamComment[4] .. teamComment[5], 0, 1600)]]
 	end
 	-- things we wanna check often
 	if (CurrentHedgehog ~= nil) then
 	--	AddCaption(GetX(CurrentHedgehog) .. "; " .. GetY(CurrentHedgehog))
 function onGearResurrect(gear)
 	AddVisualGear(GetX(gear), GetY(gear), vgtBigExplosion, 0, false)
 end
+function InABetterPlaceNow(gear)
+	for i = 0, (numhhs-1) do
+		if gear == hhs[i] then
+			hhs[i] = nil
+		end
+	end
+end
+function onHogHide(gear)
+	 InABetterPlaceNow(gear)
+end
+function onHogRestore(gear)
+	match = false
+	for i = 0, (numhhs-1) do
+		if (hhs[i] == nil) and (match == false) then
+			hhs[i] = gear
+			--AddCaption(GetHogName(gear) .. " has reappeared it seems!")
+			--FollowGear(gear)
+			match = true
+		end
+	end
+end
 function onGearAdd(gear)
 	if GetGearType(gear) == gtHedgehog then
 		hhs[numhhs] = gear
 		numhhs = numhhs + 1
 		SetEffect(gear, heResurrectable, true)
 	end
 end
 function onGearDelete(gear)
 	if GetGearType(gear) == gtHedgehog then
-	--AddCaption("gear deleted!")
+		InABetterPlaceNow(gear)
-		for i = 0, (numhhs-1) do
+	end
-			if gear == hhs[i] then
-				hhs[i] = nil
+end
-				--AddCaption("for real")
-			end
-		end
-	end
-end

changeset 5842	30e374a27269
parent 5806	6778f0a7d896
child 7838	5c2337f8dbb2