hedgewars-draft: comparison share/hedgewars/Data/Maps/ClimbHome/map.lua

equal deleted inserted replaced

-:df9d9d19406a
+:5acf6b91df76
 local tauntNoo = false
 local jokeAwardNavy = nil
 local jokeAwardSpeed = nil
 local jokeAwardDamage = nil
 local recordBroken = false
-local ready = false
 local dummyHog = nil
 local dummySkip = 0
 local baseWaterSpeed = 2
 local waterSpeed = 0
 local waterAccel = 0
 elseif gear == Cake then
 Cake = nil
 elseif GetGearType(gear) == gtHedgehog then
 	onGameTick20()
 	onGearDamage(gear, 0)
-ready = false
 HH[gear] = nil
 end
 end
 function onGameStart()
 AddGear(airMineX[a],airMineY[a], gtAirMine, gsttmpFlag, 0, 0, 0)
 end
 end
 end
-ready = false
 startTime = GameTime
 --disable to preserve highest over multiple turns
 --will need to change water check too ofc
 MaxHeight = 32640
 hTagHeight = 33000
 HogTurnLeft(CurrentHedgehog, true)
 if not HogsAreInvulnerable then SetEffect(CurrentHedgehog,heInvulnerable,0) end
 AddVisualGear(1951,32640,vgtExplosion,0,false)
 SetState(CurrentHedgehog,band(GetState(CurrentHedgehog),bnot(gstInvisible)))
 SetWeapon(amRope)
-ready = true
 else
 dummySkip = GameTime+1
 end
 end
 for hog, _ in pairs(multiplayerWinningHogs) do
 --    if g5 > 360 then g5 = 0 end
 --    SetVisualGearValues(s, g1, g2, g3, g4, g5, g6, g7, g8, g9, g10)
 --end
 end
-if not ready then
-return
-end
 -- This will be executed if a player reached home in multiplayer
 if multiplayerVictoryDelay > 0 then
 multiplayerVictoryDelay = multiplayerVictoryDelay - 20
 if multiplayerVictoryDelay <= 0 then
 -- If delay's over, the game will continue with the next hog
 Cake = nil
 end
 if Cake ~= nil and GetHealth(Cake) < 999980 and gearIsInCircle(CurrentHedgehog,cx,cy,450) then
 FireBoom(cx,cy,200) -- todo animate
+DeleteGear(Cake)
+Cake = nil
+end
+end
+if CurrentHedgehog ~= nil and band(GetState(CurrentHedgehog),gstHHDriven) == 0 then
+for f,i in pairs(Fire) do -- takes too long to fall otherwise
+DeleteGear(f)
+end
+if Cake ~= nil then
 DeleteGear(Cake)
 Cake = nil
 end
 end
 999999999, -- frameticks
 sprStar, -- star
 0, c)
 --,  0xFFCC00FF) -- could be fun to make colour shift as you rise...
 Stars[s] = 1
 end
-end
-if CurrentHedgehog ~= nil and band(GetState(CurrentHedgehog),gstHHDriven) == 0 then
-for f,i in pairs(Fire) do -- takes too long to fall otherwise
-DeleteGear(f)
-end
-if Cake ~= nil then
-DeleteGear(Cake)
-Cake = nil
-end
-end
-if CurrentHedgehog ~= nil and TurnTimeLeft > 0 then
 local vx, vy = GetGearVelocity(CurrentHedgehog)
-	local distanceFromWater = WaterLine - y
+local distanceFromWater = WaterLine - y
 --[[ check joke awards ]]
 -- navy award: when distance from main map is over 1000
 local navyDistance = 1250
 if x < -navyDistance or x > LAND_WIDTH+navyDistance then
 teamName = GetHogTeamName(CurrentHedgehog),
 distance = distanceFromWater
 }
 end
 end
-local finishTime = (GameTime-startTime)/1000
-local roundedFinishTime = math.ceil(math.floor(finishTime+0.5))
+local finishTime = (GameTime-startTime)/1000
-if isSinglePlayer then
+local roundedFinishTime = math.ceil(math.floor(finishTime+0.5))
-if distanceFromWater < 0 and not YouLost and not YouWon then
+if isSinglePlayer then
-makeSinglePlayerLoserStats()
+if distanceFromWater < 0 and not YouLost and not YouWon then
-YouLost = true
+makeSinglePlayerLoserStats()
-ready = false
+YouLost = true
 end
 -- FIXME: Hog is also in winning box if it just walks into the chair from the left, touching it. Intentional?
 if not YouWon and not YouLost and gearIsInBox(CurrentHedgehog, 1920, 252, 50, 50) then
 AddCaption(loc("Victory!"))
 ShowMission(loc("Climb Home"),
 loc("Made it!"),
 string.format(loc("Ahhh, home, sweet home. Made it in %d seconds."), roundedFinishTime),
 -amRope, 0)
 PlaySound(sndVictory,CurrentHedgehog)
 SetState(CurrentHedgehog, gstWinner)
 SendStat(siGameResult, loc("You have beaten the challenge!"))
 SendStat(siGraphTitle, loc("Your height over time"))
 SendStat(siCustomAchievement, string.format(loc("%s reached home in %.3f seconds. Congratulations!"), GetHogName(CurrentHedgehog), finishTime))
 SendStat(siCustomAchievement, string.format(loc("%s bravely climbed up to a dizzy height of %d to reach home."), GetHogName(CurrentHedgehog), getActualHeight(RecordHeight)))
 SendStat(siPointType, loc("seconds"))
 SendStat(siPlayerKills, tostring(roundedFinishTime), GetHogTeamName(CurrentHedgehog))
+EndGame()
+onAchievementsDeclaration()
+YouWon = true
+end
+else
+if distanceFromWater < 0 and not YouLost and not YouWon then
+makeMultiPlayerLoserStat(CurrentHedgehog)
+deadHedgehogs = deadHedgehogs + 1
+YouLost = true
+if deadHedgehogs >= totalHedgehogs then
+makeFinalMultiPlayerStats()
 EndGame()
 onAchievementsDeclaration()
-YouWon = true
+end
-ready = false
+end
-end
+-- Check victory
-else
+if not YouWon and not YouLost and gearIsInBox(CurrentHedgehog, 1920, 252, 50, 50) and
-if distanceFromWater < 0 and not YouLost and not YouWon then
+-- Delay victory if MrMine is triggered
-makeMultiPlayerLoserStat(CurrentHedgehog)
+(not MrMine or (MrMine and band(GetState(MrMine), gstAttacking) == 0)) then
-deadHedgehogs = deadHedgehogs + 1
+-- Player managed to reach home in multiplayer.
-YouLost = true
+-- Stop hog, disable controls, celebrate victory and continue the game after 4 seconds.
-ready = false
+AddCaption(string.format(loc("%s climbed home in %d seconds!"), GetHogName(CurrentHedgehog), roundedFinishTime))
-if deadHedgehogs >= totalHedgehogs then
+SendStat(siCustomAchievement, string.format(loc("%s (%s) reached home in %.3f seconds."), GetHogName(CurrentHedgehog), GetHogTeamName(CurrentHedgehog), finishTime))
-makeFinalMultiPlayerStats()
+makeMultiPlayerWinnerStat(CurrentHedgehog)
-EndGame()
+PlaySound(sndVictory, CurrentHedgehog)
-onAchievementsDeclaration()
+-- TODO: Unselect weapon.
-end
+-- Note: SetWeapon(amNothing) does not work. :-(
-end
+SetGearMessage(CurrentHedgehog, band(GetGearMessage(CurrentHedgehog), bnot(gmLeft+gmRight+gmUp+gmDown+gmHJump+gmLJump+gmPrecise)))
--- Check victory
+SetInputMask(0x00)
-if not YouWon and not YouLost and gearIsInBox(CurrentHedgehog, 1920, 252, 50, 50) and
+-- TODO: Add stupid winner grin.
--- Delay victory if MrMine is triggered
+multiplayerVictoryDelay = 4000
-(not MrMine or (MrMine and band(GetState(MrMine), gstAttacking) == 0)) then
+YouWon = true
--- Player managed to reach home in multiplayer.
+end
--- Stop hog, disable controls, celebrate victory and continue the game after 4 seconds.
+end
-AddCaption(string.format(loc("%s climbed home in %d seconds!"), GetHogName(CurrentHedgehog), roundedFinishTime))
-SendStat(siCustomAchievement, string.format(loc("%s (%s) reached home in %.3f seconds."), GetHogName(CurrentHedgehog), GetHogTeamName(CurrentHedgehog), finishTime))
-makeMultiPlayerWinnerStat(CurrentHedgehog)
-PlaySound(sndVictory, CurrentHedgehog)
--- TODO: Unselect weapon.
--- Note: SetWeapon(amNothing) does not work. :-(
-SetGearMessage(CurrentHedgehog, band(GetGearMessage(CurrentHedgehog), bnot(gmLeft+gmRight+gmUp+gmDown+gmHJump+gmLJump+gmPrecise)))
-SetInputMask(0x00)
--- TODO: Add stupid winner grin.
-multiplayerVictoryDelay = 4000
-YouWon = true
-ready = false
-end
-end
 if GameTime % 500 == 0 then
 if not isSinglePlayer then
 	        for t,i in pairs(teams) do
 if currTeam == t then
 SendStat(siClanHealth, tostring(getActualHeight(y)), t)
 else
 SendStat(siClanHealth, '0', t)
 end
 end
-elseif CurrentHedgehog ~= nil then
+else
 SendStat(siClanHealth, tostring(getActualHeight(y)), GetHogTeamName(CurrentHedgehog))
 end
 -- play taunts
 if not YouWon and not YouLost then
 EndGame()
 onAchievementsDeclaration()
 end
 end
 YouLost = true
-ready = false
 end
 end
 function makeLoserComment()
 local m

changeset 12760	5acf6b91df76
parent 12754	c7224d202e8b
child 12825	b986a8b8cd56