# HG changeset patch # User alfadur # Date 1542650824 -10800 # Node ID 7363168382ca5c86e980898f08ccad884568a6f0 # Parent bf627790da14b3066790cd60534c4a9f39401c80# Parent d5f4e0cafe898afa8a479332359d19ae8a937350 merge diff -r d5f4e0cafe89 -r 7363168382ca share/hedgewars/Data/Graphics/Missions/Scenario/User_Mission_-_Teamwork.png Binary file share/hedgewars/Data/Graphics/Missions/Scenario/User_Mission_-_Teamwork.png has changed diff -r d5f4e0cafe89 -r 7363168382ca share/hedgewars/Data/Graphics/Missions/Scenario/User_Mission_-_Teamwork@2x.png Binary file share/hedgewars/Data/Graphics/Missions/Scenario/User_Mission_-_Teamwork@2x.png has changed diff -r d5f4e0cafe89 -r 7363168382ca share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua Mon Nov 19 19:44:44 2018 +0300 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua Mon Nov 19 21:07:04 2018 +0300 @@ -42,7 +42,7 @@ SetGearPosition(instructor,317,902) SetGearPosition(enemy,1918,837) - HogSay(player, ".............................", SAY_THINK) + HogSay(player, loc("..."), SAY_THINK) HogTurnLeft(instructor, true) end diff -r d5f4e0cafe89 -r 7363168382ca share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua Mon Nov 19 19:44:44 2018 +0300 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua Mon Nov 19 21:07:04 2018 +0300 @@ -70,16 +70,6 @@ end - ---function onGameTick() - - --if CurrentHedgehog ~= nil then - -- AddCaption(GetX(CurrentHedgehog) .. ";" .. GetY(CurrentHedgehog)) - --end - ---end - - function onAmmoStoreInit() SetAmmo(amBlowTorch, 0, 0, 0, 1) SetAmmo(amGirder, 0, 0, 0, 1) @@ -91,20 +81,16 @@ SetAmmo(amSkip, 9, 0, 0, 0) end -function onGearDamage(gear, damage) - if (gear == player) and (damage == 30) then - HogSay(player,loc("T_T"),SAY_SHOUT) - end -end - function onGearDelete(gear) if gear == bCrate then HogSay(CurrentHedgehog, loc("Hmmm..."), SAY_THINK) end - if GetGearType(gear) == gtCase then + if (GetGearType(gear) == gtCase) and (band(GetGearMessage(gear), gmDestroy) ~= 0) then SetTurnTimeLeft(TurnTimeLeft + 5000) + AddCaption(string.format(loc("+%d seconds!"), 5), GetClanColor(GetHogClan(CurrentHedgehog)), capgrpMessage) + PlaySound(sndExtraTime) end -- Note: The victory sequence is done automatically by Hedgewars if ( ((gear == player) or (gear == p2)) and (GameOver == false)) then