# HG changeset patch # User Wuzzy # Date 1479310364 -3600 # Node ID c8979eeb73fa10f75e5635e225bcf531afa0fb6d # Parent 618d99523933fc40a78d4207fd5d48d28f55425f Fix ClimbHome mission bugs (broken teams, broken graph) diff -r 618d99523933 -r c8979eeb73fa share/hedgewars/Data/Maps/ClimbHome/map.lua --- a/share/hedgewars/Data/Maps/ClimbHome/map.lua Wed Nov 16 16:18:32 2016 +0100 +++ b/share/hedgewars/Data/Maps/ClimbHome/map.lua Wed Nov 16 16:32:44 2016 +0100 @@ -35,8 +35,6 @@ local jokeAwardDamage = nil local recordBroken = false local ready = false -local showWaterStats = false -- uses the AI team to draw water height. -local scaleGraph = false local dummyHog = nil local dummySkip = 0 local baseWaterSpeed = 2 @@ -80,18 +78,6 @@ --EnableGameFlags(gfDisableLandObjects) -- force seed instead. Some themes will still be easier, but at least you won't luck out on the same theme Seed = ClimbHome - if showWaterStats then - AddTeam(" ", 0x545C9D, "Simple", "Island", "Default") - elseif scaleGraph then - AddTeam(" ", 0x050505, "Simple", "Island", "Default") - end - if showWaterStats or scaleGraph then - dummyHog = AddHog(" ", 0, 1, "NoHat") - HH[dummyHog] = nil - totalHedgehogs = totalHedgehogs - 1 - teams[GetHogTeamName(dummyHog)] = nil - SendStat(siClanHealth, tostring(32640), " ") - end end function onGearAdd(gear) @@ -118,9 +104,6 @@ end function onGameStart() - if showWaterStats or scaleGraph then - DeleteGear(dummyHog) - end --SetClanColor(ClansCount-1, 0x0000ffff) appears to be broken SendHealthStatsOff() ShowMission(loc("Climb Home"), @@ -406,18 +389,16 @@ end if GameTime % 500 == 0 then - --if isSinglePlayer and MaxHeight < 32000 and WaterRise == nil then - -- WaterRise = AddGear(0,0,gtWaterUp, 0, 0, 0, 0) - --end - if showWaterStats == true then - SendStat(siClanHealth, tostring(getActualHeight(WaterLine)), " ") - end - for t,i in pairs(teams) do - if currTeam == t then - SendStat(siClanHealth, tostring(getActualHeight(y)), t) - else - SendStat(siClanHealth, '0', t) + 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 + SendStat(siClanHealth, tostring(getActualHeight(y)), GetHogTeamName(CurrentHedgehog)) end -- play taunts @@ -639,7 +620,7 @@ local winner = ranking[#ranking] local loser = ranking[1] SendStat(siGameResult, string.format(loc("%s wins!"), winner.name)) - SendStat(siGraphTitle, string.format(loc("Team’s best heights per round"))) + SendStat(siGraphTitle, string.format(loc("Height over time"))) if winner.score < 1500 then SendStat(siCustomAchievement, string.format(loc("This round’s award for ultimate disappointment goes to: Everyone!"))) diff -r 618d99523933 -r c8979eeb73fa share/hedgewars/Data/Missions/Training/ClimbHome.lua --- a/share/hedgewars/Data/Missions/Training/ClimbHome.lua Wed Nov 16 16:18:32 2016 +0100 +++ b/share/hedgewars/Data/Missions/Training/ClimbHome.lua Wed Nov 16 16:32:44 2016 +0100 @@ -1,13 +1,11 @@ HedgewarsScriptLoad("/Scripts/Locale.lua") -local isSinglePlayer = true +isSinglePlayer = true -- trying to allow random theme, but fixed theme objects... -- Also skip some ugly themes, or ones where the sky is "meh" --local themes = { "Art","Cake","City","EarthRise","Halloween","Olympics","Underwater","Bamboo","Castle","Compost","Eyes","Hell","Planes","Bath","Cave","CrazyMission","Freeway","Island","Sheep","Blox","Cheese","Deepspace","Fruit","Jungle","Snow","Brick","Christmas","Desert","Golf","Nature","Stage" } local themes = {"Christmas","Hell","Bamboo","City","Island","Bath","Compost","Jungle","Desert","Nature","Olympics","Brick","EarthRise","Sheep","Cake","Freeway","Snow","Castle","Fruit","Stage","Cave","Golf","Cheese","Halloween"} -local showWaterStats = true -- uses the AI team to draw water height. -local scaleGraph = true local totalHedgehogs = 0 local HH = {} local teams = {} @@ -28,11 +26,6 @@ AddTeam(loc("Lonely Hog"), 0xDD0000, "Simple", "Island", "Default") player = AddHog(loc("Climber"), 0, 1, "NoHat") if showWaterStats then - AddTeam(" ", 0x545C9D, "Simple", "Island", "Default") - elseif scaleGraph then - AddTeam(" ", 0x050505, "Simple", "Island", "Default") - end - if showWaterStats or scaleGraph then dummyHog = AddHog(" ", 0, 1, "NoHat") HH[dummyHog] = nil totalHedgehogs = totalHedgehogs - 1