# HG changeset patch # User Periklis Ntanasis # Date 1372126623 -10800 # Node ID 5069877daa09278c9ca573ef950a31e864894e38 # Parent 5c760ed50b3dc288dbad33397f7934d5c66e281f reverting 2 files I accidentally changed diff -r 5c760ed50b3d -r 5069877daa09 share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/first_blood.lua --- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/first_blood.lua Tue Jun 25 05:10:13 2013 +0300 +++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/first_blood.lua Tue Jun 25 05:17:03 2013 +0300 @@ -77,7 +77,6 @@ } -----------------------------Animations-------------------------------- function Skipanim(anim) -WriteLnToConsole("SWITCH HOG") AnimSwitchHog(youngh) if goals[anim] ~= nil then ShowMission(unpack(goals[anim])) @@ -112,11 +111,9 @@ table.insert(elderDamagedAnim, {func = AnimWait, args = {elderh, 500}, skipFunc = Skipanim, skipArgs = elderDamagedAnim}) table.insert(elderDamagedAnim, {func = AnimSay, args = {elderh, loc("Violence is not the answer to your problems!"), SAY_SAY, 3000}}) table.insert(elderDamagedAnim, {func = AnimGearWait, args = {youngh, 500}}) - WriteLnToConsole("START DIALOG") - WriteLnToConsole("END GAME START") + AddSkipFunction(startDialogue, Skipanim, {startDialogue}) - --table.insert(startDialogue, {func = AnimWait, args = {youngh, 3500}, skipFunc = Skipanim, skipArgs = startDialogue}) - table.insert(startDialogue, {func = WriteLnToConsole, args = {"FIRST PRINT"}}) + table.insert(startDialogue, {func = AnimWait, args = {youngh, 3500}, skipFunc = Skipanim, skipArgs = startDialogue}) table.insert(startDialogue, {func = AnimCaption, args = {youngh, loc("Once upon a time, on an island with great natural resources, lived two tribes in heated conflict..."), 5000}}) table.insert(startDialogue, {func = AnimCaption, args = {youngh, loc("One tribe was peaceful, spending their time hunting and training, enjoying the small pleasures of life..."), 5000}}) table.insert(startDialogue, {func = AnimCaption, args = {youngh, loc("The other one were all cannibals, spending their time eating the organs of fellow hedgehogs..."), 5000}}) @@ -128,7 +125,7 @@ table.insert(startDialogue, {func = AnimTurn, args = {princess, "Right"}}) table.insert(startDialogue, {func = AnimSwitchHog, args = {youngh}}) table.insert(startDialogue, {func = AnimShowMission, args = {youngh, loc("First Blood"), loc("First Steps"), loc("Press [Left] or [Right] to move around, [Enter] to jump"), 1, 4000}}) -WriteLnToConsole("START DIALOG END") + AddSkipFunction(onShroomAnim, SkipOnShroom, {onShroomAnim}) table.insert(onShroomAnim, {func = AnimSay, args = {elderh, loc("I can see you have been training diligently."), SAY_SAY, 4000}, skipFunc = Skipanim, skipArgs = onShroomAnim}) table.insert(onShroomAnim, {func = AnimSay, args = {elderh, loc("The wind whispers that you are ready to become familiar with tools, now..."), SAY_SAY, 4000}}) @@ -638,7 +635,6 @@ end function onGameStart() - progress = tonumber(GetCampaignVar("Progress")) TurnTimeLeft = -1 FollowGear(youngh) @@ -709,7 +705,6 @@ end function onNewTurn() -WriteLnToConsole("NEW TURN") if CurrentHedgehog == cannibal and cannibalVisible == false then SetState(cannibal, gstInvisible) end diff -r 5c760ed50b3d -r 5069877daa09 share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/journey.lua --- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/journey.lua Tue Jun 25 05:10:13 2013 +0300 +++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/journey.lua Tue Jun 25 05:17:03 2013 +0300 @@ -1041,17 +1041,13 @@ end function onNewTurn() -WriteLnToConsole("ON NEW TURN") if AnimInProgress() then -WriteLnToConsole("ON NEW TURN 1") TurnTimeLeft = -1 elseif stage == endStage and CurrentHedgehog ~= leaks then -WriteLnToConsole("ON NEW TURN 2") AnimSwitchHog(leaks) SetGearMessage(leaks, 0) TurnTimeLeft = -1 elseif GetHogTeamName(CurrentHedgehog) ~= loc("Natives") then -WriteLnToConsole("ON NEW TURN 3") for i = 1, 4 do if cannibalDead[i] ~= true then if GetX(cannibals[i]) < GetX(leaks) then @@ -1064,7 +1060,6 @@ SetInputMask(band(0xFFFFFFFF, bnot(gmLeft + gmRight + gmLJump + gmHJump))) TurnTimeLeft = 20000 else -WriteLnToConsole("ON NEW TURN 4") SetInputMask(0xFFFFFFFF) TurnsLeft = TurnsLeft - 1 end