sheepy-clone: comparison share/hedgewars/Data/Scripts/Multiplayer/Space

equal deleted inserted replaced

-:95117607b81a
+:2684fdb9d874
 local fMod = 1000000 -- use this for dev and .16+ games
 -- some console stuff
 local shellID = 0
 local explosivesID = 0
+local luaGameTicks = 0
 -- gaudyRacer
 local boosterOn = false
 local roundLimit = 3	-- no longer set here (see version history)
 local roundNumber = 0
 local pointBlankHits = 0
 ---------------------
 -- tumbler goods
 ---------------------
+local moveTimer = 0
 local leftOn = false
 local rightOn = false
 local upOn = false
 local downOn = false
 local primShotsMax = 5
 local primShotsLeft = 0
+local TimeLeftCounter = 0
 local TimeLeft = 0
 local stopMovement = false
 local tumbleStarted = false
 local beam = false
 local shockwave
 local shockwaveHealth = 0
 local shockwaveRad = 300
+local Timer100 = 0
 local vTag = {}
 -----------------------------------------------
 -- CIRCLY GOODIES
 -----------------------------------------------
 local targetHit = false
 local FadeAlpha = 0 -- used to fade the circles out gracefully when player dies
 local pTimer = 0 -- tracking projectiles following player
---local m2Count = 0		-- handle speed of circs
+local circAdjustTimer = 0		-- handle adjustment of circs direction
+local m2Count = 0		-- handle speed of circs
 local vCirc = {}
 local vCCount = 0
 local rCirc = {}
 local rCircX = {}
 local rCircY = {}
 local rAlpha = 255
+local rPingTimer = 0
 local radShotsLeft = 0
 local vCircActive = {}
 local vCircHealth = {}
 local vType = {}
 	end
 end
-function onGameTick20()
+function onGameTick()
 	--WriteLnToConsole("Start of GameTick")
+	luaGameTicks = luaGameTicks + 1 -- GameTime
 	HandleCircles()
 	-- derp
 	--if shockwaveHealth > 0 then
 	--	shockwaveHealth = shockwaveHealth - 1
 	--	shockwaveRad = shockwaveRad + 5
 	--end
-	if GameTime%100 == 0 then
+	Timer100 = Timer100 + 1
+	if Timer100 >= 100 then
+		Timer100 = 0
 		if beam == true then
 			shieldHealth = shieldHealth - 1
 			if shieldHealth < 80 then -- <= 80
 				shieldHealth = 80
 		--nw WriteLnToConsole("Finished ThingsToBeRunOnGears()")
 		--runOnGears(HandleLifeSpan)
 		--runOnGears(DeleteFarFlungBarrel)
-		if CirclesAreGo == true and CurrentHedgehog ~= nil then
+		if CirclesAreGo == true then
 			CheckDistances()
 			--runOnGears(CheckVarious)	-- used to be in handletracking for some bizarre reason
 			--runOnGears(ProjectileTrack)
 		end
 	-- start the player tumbling with a boom once their turn has actually begun
 	if (tumbleStarted == false) and (gameOver == false) then
 		if (TurnTimeLeft > 0) and (TurnTimeLeft ~= TurnTime) then
 			--AddCaption(LOC_NOT("Good to go!"))
 			tumbleStarted = true
-			TimeLeft = div(TurnTime, 1000)	--45
+			TimeLeft = (TurnTime/1000)	--45
 			FadeAlpha = 0
 			rAlpha = 255
 			AddGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), gtGrenade, 0, 0, 0, 1)
 			DrawTag(0)
 			DrawTag(1)
 	if (CurrentHedgehog ~= nil) and (tumbleStarted == true) then
 		--AddCaption(GetX(CurrentHedgehog) .. ";" .. GetY(CurrentHedgehog) )
 		-- Calculate and display turn time
-		if GameTime%1000 == 0 then
+		TimeLeftCounter = TimeLeftCounter + 1
+		if TimeLeftCounter == 1000 then
+			TimeLeftCounter = 0
 			TimeLeft = TimeLeft - 1
 			if TimeLeft >= 0 then
 				--AddCaption(LOC_NOT("Time Left: ") .. TimeLeft)
 				DrawTag(0)
 					chainLength = 0
 				end
 			end
 			-- handle movement based on IO
-			if GameTime%100 == 0 then -- 100
+			moveTimer = moveTimer + 1
+			if moveTimer == 100 then -- 100
 				--nw WriteLnToConsole("Start of Player MoveTimer")
+				moveTimer = 0
 				---------------
 				-- new trail code
 				---------------
 				-- the trail lets you know you have 5s left to pilot, akin to birdy feathers
 		vCircDX[i] = 0
 		vCircDY[i] = 0
 		vType[i] = "generic"
 		vCounter[i] = 0
-		vCounterLim[i] = 150
+		vCounterLim[i] = 3000
 		vCircScore[i] = 0
 		vCircHealth[i] = 1
 		vCircMinA[i] = 80	--80 --20
 		vCircMaxA[i] = 255
 		--if r <= 2 then
 			vCircCol[i] = 0xff0000ff -- red
 			vType[i] = "drone"
 			vCircRadMin[i] = 50	*5
 			vCircRadMax[i] = 90	*5
-			vCounterLim[i] = 150
+			vCounterLim[i] = 3000
 			vCircScore[i] = 10
 			vCircHealth[i] = 1
 		--else
 		elseif r == 1 then
 			vCircCol[i] = 0x00ff00ff -- green
 			vCircCol[i] = 0x0050ffff -- sexy blue
 			vType[i] = "blueboss"
 			vCircRadMin[i] = 100*5
 			vCircRadMax[i] = 180*5
 			vCircWidth[i] = 1
-			vCounterLim[i] = 100
+			vCounterLim[i] = 2000
 			vCircScore[i] = 30
 			vCircHealth[i] = 3
 		else
 		--elseif r == 1 then
 			--vCircCol[i] = 0xffae00ff -- orange
 			--end
 		end
 	-- if player is hit by circle bazooka
-	elseif (GetGearType(gear) == gtShell) and (CurrentHedgehog ~= nil) then --or (GetGearType(gear) == gtBall) then
+	elseif (GetGearType(gear) == gtShell) then --or (GetGearType(gear) == gtBall) then
 		dist = GetDistFromGearToGear(gear, CurrentHedgehog)
 		if beam == true then
 	end]]
 	if rAlpha ~= 255 then
-		if GameTime%100 == 0 then
+		rPingTimer = rPingTimer + 1
+		if rPingTimer == 100 then
+			rPingTimer = 0
 			rAlpha = rAlpha + 5
 			if rAlpha >= 255 then
 				rAlpha = 255
 			end
 	end
 	-- alter the circles velocities
-	if GameTime%2000 == 0 then
+	circAdjustTimer = circAdjustTimer + 1
+	if circAdjustTimer == 2000 then
+		circAdjustTimer = 0
 		for i = 0,(vCCount-1) do
 			-- bounce the circles off the edges if they go too far
 			-- or make them move in random directions
 			if vCircX[i] > 5500 then
-				vCircDX[i] = -4	--5 circmovchange
+				vCircDX[i] = -5	--5 circmovchange
 			elseif vCircX[i] < -1500 then
-				vCircDX[i] = 4	--5 circmovchange
+				vCircDX[i] = 5	--5 circmovchange
 			else
 				z = GetRandom(2)
 				if z == 1 then
 					z = 1
 				end
 				vCircDX[i] = vCircDX[i] + GetRandom(3)*z	--3 circmovchange
 			end
 			if vCircY[i] > 1500 then
-				vCircDY[i] = -4	--5 circmovchange
+				vCircDY[i] = -5	--5 circmovchange
 			elseif vCircY[i] < -2900 then
-				vCircDY[i] = 4	--5 circmovchange
+				vCircDY[i] = 5	--5 circmovchange
 			else
 				z = GetRandom(2)
 				if z == 1 then
 					z = 1
 				else
 		end
 	end
 	-- move the circles according to their current velocities
-	--m2Count = m2Count + 1
+	m2Count = m2Count + 1
-	--if m2Count == 25 then	--25 circmovchange
+	if m2Count == 25 then	--25 circmovchange
-	--	m2Count = 0
+		m2Count = 0
 		for i = 0,(vCCount-1) do
 			vCircX[i] = vCircX[i] + vCircDX[i]
 			vCircY[i] = vCircY[i] + vCircDY[i]
 			if (CurrentHedgehog ~= nil) and (rAlpha ~= 255) then
 			--AddVisualGear(GetX(CurrentHedgehog)-mrm+GetRandom(mrm*2),GetY(CurrentHedgehog)-mrm+GetRandom(mrm*2), vgtSmoke, 0, false)
 		end
-	--end
+	end
 	for i = 0,(vCCount-1) do
 		g1, g2, g3, g4, g5, g6, g7, g8, g9, g10 = GetVisualGearValues(vCirc[i])		-- vCircCol[i] g10
 		SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], g3, g4, g5, g6, g7, vCircRadius[i], g9, g10)
 	end
 		--WriteLnToConsole("I'm trying to track currenthedge with shell ID: " .. getGearValue(gear,"ID"))
 		--WriteLnToConsole("I just got the velocity of the shell. It is dx: " .. dx .. "; dy: " .. dy)
 		--WriteLnToConsole("CurrentHedgehog is at X: " .. GetX(CurrentHedgehog) .. "; Y: " .. GetY(CurrentHedgehog) )
-if CurrentHedgehog ~= nil then
+		if GetX(gear) > GetX(CurrentHedgehog) then
-if GetX(gear) > GetX(CurrentHedgehog) then
+			dx = dx - turningSpeed--0.1
-dx = dx - turningSpeed--0.1
+		else
-else
+			dx = dx + turningSpeed--0.1
-dx = dx + turningSpeed--0.1
+		end
-end
+		if GetY(gear) > GetY(CurrentHedgehog) then
-if GetY(gear) > GetY(CurrentHedgehog) then
+			dy = dy - turningSpeed--0.1
-dy = dy - turningSpeed--0.1
+		else
-else
+			dy = dy + turningSpeed--0.1
-dy = dy + turningSpeed--0.1
+		end
-end
-end
 		if (GetGearType(gear) == gtShell) then
 			dxlimit = 0.4*fMod
 			dylimit = 0.4*fMod

changeset 7717	2684fdb9d874
parent 7229	c34516ec0f27
child 7838	5c2337f8dbb2