equal
deleted
inserted
replaced
262 function onNewTurn() |
262 function onNewTurn() |
263 if not inBattle and CurrentHedgehog == green1.gear then |
263 if not inBattle and CurrentHedgehog == green1.gear then |
264 SkipTurn() |
264 SkipTurn() |
265 elseif (not inBattle) and GetHogTeamName(CurrentHedgehog) == teamA.name then |
265 elseif (not inBattle) and GetHogTeamName(CurrentHedgehog) == teamA.name then |
266 if CurrentHedgehog ~= hero.gear then |
266 if CurrentHedgehog ~= hero.gear then |
|
267 -- FIXME: This screw up the selected weapon caption, as |
|
268 -- SwitchHog does not update the selected display caption |
267 AnimSwitchHog(hero.gear) |
269 AnimSwitchHog(hero.gear) |
268 end |
270 end |
|
271 -- Workaround: Add a caption that overwrites the displayed weapon display |
|
272 AddCaption(loc("Let's go!"), capcolDefault, capgrpAmmoinfo) |
269 SetTurnTimeLeft(MAX_TURN_TIME) |
273 SetTurnTimeLeft(MAX_TURN_TIME) |
270 wind() |
274 wind() |
271 elseif inBattle then |
275 elseif inBattle then |
272 if CurrentHedgehog == green1.gear and previousHog ~= hero.gear then |
276 if CurrentHedgehog == green1.gear and previousHog ~= hero.gear then |
273 SkipTurn() |
277 SkipTurn() |