--- a/share/hedgewars/Data/Maps/Basketball/map.lua Wed Dec 08 15:10:38 2010 -0500
+++ b/share/hedgewars/Data/Maps/Basketball/map.lua Wed Dec 08 22:35:29 2010 +0100
@@ -111,7 +111,7 @@
end
function onGameStart()
- ShowMission(loc(caption), loc(subcaption), loc(goal), -amBaseballBat, 0);
+ ShowMission(loc(caption), loc(subcaption), loc(goal), -amBaseballBat, 0)
started = true
end
--- a/share/hedgewars/Data/Missions/Campaign/01#Boot Camp.lua Wed Dec 08 15:10:38 2010 -0500
+++ b/share/hedgewars/Data/Missions/Campaign/01#Boot Camp.lua Wed Dec 08 22:35:29 2010 +0100
@@ -250,12 +250,12 @@
elseif progress > 0 and ((TurnTimeLeft == 0) or (GetHealth(player) ~= player_health) or (GetHealth(instructor) ~= instructor_health)) then
progress = -1
- ShowMission(loc(caption), loc(subcaption), loc(failed), -amBazooka, 0);
+ ShowMission(loc(caption), loc(subcaption), loc(failed), -amBazooka, 0)
time_start = GameTime
PlaySound(sndNooo)
TurnTimeLeft = 0
elseif GameTime == 0 then
- ShowMission(loc(caption), loc(subcaption), loc(goals[0]), -amBazooka, 0);
+ ShowMission(loc(caption), loc(subcaption), loc(goals[0]), -amBazooka, 0)
TurnTimeLeft = 60000
elseif GameTime == 2500 then
FollowGear(instructor)
@@ -269,7 +269,7 @@
progress = 1
TurnTimeLeft = 10000
elseif progress == 1 then
- local x, y = GetGearPosition(player);
+ local x, y = GetGearPosition(player)
if x < player_start_x - 50 then
progress = 2
FollowGear(instructor)
@@ -277,7 +277,7 @@
TurnTimeLeft = 10000
end
elseif progress == 2 then
- local x, y = GetGearPosition(player);
+ local x, y = GetGearPosition(player)
if x > player_start_x then
progress = 3
FollowGear(instructor)
@@ -291,7 +291,7 @@
HogTurnLeft(player, true)
TurnTimeLeft = 10000
elseif progress == 4 then
- local x, y = GetGearPosition(player);
+ local x, y = GetGearPosition(player)
if y < player_start_y then
progress = 5
FollowGear(instructor)
@@ -308,15 +308,15 @@
elseif progress == 5 and (time_start + 7500 == GameTime) then
FollowGear(instructor)
HogSay(instructor, loc(drill[8]), SAY_SHOUT)
- ShowMission(loc(caption), loc(subcaption), loc(goals[1]), 1, 0);
+ ShowMission(loc(caption), loc(subcaption), loc(goals[1]), 1, 0)
target = AddGear(target_x, target_y, gtTarget, 0, 0, 0, 0)
TurnTimeLeft = 60000
elseif progress == 5 and (time_start + 10000 == GameTime) then
FollowGear(target)
elseif progress == 6 then
progress = 7
- ShowMission(loc(caption), loc(subcaption), loc(goals[2]), 0, 0);
- PlaySound(sndVictory);
+ ShowMission(loc(caption), loc(subcaption), loc(goals[2]), 0, 0)
+ PlaySound(sndVictory)
time_start = GameTime
elseif progress == 7 and (time_start + 2500 == GameTime) then
EndGame()
@@ -336,14 +336,14 @@
AddTeam(loc(teamnames[0]), teamcolor, "Simple", "Island", "Default")
player = AddHog(loc(hognames[0]), 0, player_health, "NoHat")
- SetGearPosition(player, player_start_x, player_start_y);
+ SetGearPosition(player, player_start_x, player_start_y)
AddTeam(loc(teamnames[1]), teamcolor + 1, "Simple", "Island", "Default")
instructor = AddHog(loc(hognames[1]), 0, instructor_health, "NoHat")
SetGearPosition(instructor, player_start_x + 100, player_start_y)
HogTurnLeft(instructor, true)
- FollowGear(player);
+ FollowGear(player)
end
function onAmmoStoreInit()
--- a/share/hedgewars/Data/Missions/Training/Bazooka.lua Wed Dec 08 15:10:38 2010 -0500
+++ b/share/hedgewars/Data/Missions/Training/Bazooka.lua Wed Dec 08 22:35:29 2010 +0100
@@ -174,7 +174,7 @@
AddTeam(loc(teamname), 14483456, "Simple", "Island", "Default")
-- And add a hog to it
player = AddHog(loc(hogname), 0, 1, "NoHat")
- SetGearPosition(player, 1960, 1160);
+ SetGearPosition(player, 1960, 1160)
end
-- This function is called when the round starts
@@ -190,7 +190,7 @@
-- A negative icon parameter (-n) represents the n-th weapon icon
-- A positive icon paramter (n) represents the (n+1)-th mission icon
-- A timeframe of 0 is replaced with the default time to show.
- ShowMission(loc(caption), loc(subcaption), loc(goal), -amBazooka, 0);
+ ShowMission(loc(caption), loc(subcaption), loc(goal), -amBazooka, 0)
end
-- This function is called every game tick.
@@ -204,9 +204,9 @@
if TurnTimeLeft == 1 and score < score_goal then
game_lost = true
-- ... and show a short message.
- ShowMission(loc(caption), loc(subcaption), loc(timeout), -amSkip, 0);
+ ShowMission(loc(caption), loc(subcaption), loc(timeout), -amSkip, 0)
-- How about killing our poor hog due to his poor performance?
- SetHealth(player, 0);
+ SetHealth(player, 0)
-- Just to be sure set the goal time to 1 ms
time_goal = 1
end
@@ -253,7 +253,7 @@
else
if not game_lost then
-- Otherwise show that the goal was accomplished
- ShowMission(loc(caption), loc(subcaption), loc(success), 0, 0);
+ ShowMission(loc(caption), loc(subcaption), loc(success), 0, 0)
-- Also let the hogs shout "victory!"
PlaySound(sndVictory)
-- Save the time left so we may keep it.
--- a/share/hedgewars/Data/Missions/Training/Shotgun.lua Wed Dec 08 15:10:38 2010 -0500
+++ b/share/hedgewars/Data/Missions/Training/Shotgun.lua Wed Dec 08 22:35:29 2010 +0100
@@ -174,7 +174,7 @@
AddTeam(loc(teamname), 14483456, "Simple", "Island", "Default")
-- And add a hog to it
player = AddHog(loc(hogname), 0, 1, "NoHat")
- SetGearPosition(player, 2334, 1254);
+ SetGearPosition(player, 2334, 1254)
end
-- This function is called when the round starts
@@ -190,7 +190,7 @@
-- A negative icon parameter (-n) represents the n-th weapon icon
-- A positive icon paramter (n) represents the (n+1)-th mission icon
-- A timeframe of 0 is replaced with the default time to show.
- ShowMission(loc(caption), loc(subcaption), loc(goal), -amShotgun, 0);
+ ShowMission(loc(caption), loc(subcaption), loc(goal), -amShotgun, 0)
end
-- This function is called every game tick.
@@ -204,9 +204,9 @@
if TurnTimeLeft == 1 and score < score_goal then
game_lost = true
-- ... and show a short message.
- ShowMission(loc(caption), loc(subcaption), loc(timeout), -amSkip, 0);
+ ShowMission(loc(caption), loc(subcaption), loc(timeout), -amSkip, 0)
-- How about killing our poor hog due to his poor performance?
- SetHealth(player, 0);
+ SetHealth(player, 0)
-- Just to be sure set the goal time to 1 ms
time_goal = 1
end
@@ -253,7 +253,7 @@
else
if not game_lost then
-- Otherwise show that the goal was accomplished
- ShowMission(loc(caption), loc(subcaption), loc(success), 0, 0);
+ ShowMission(loc(caption), loc(subcaption), loc(success), 0, 0)
-- Also let the hogs shout "victory!"
PlaySound(sndVictory)
-- Save the time left so we may keep it.
--- a/share/hedgewars/Data/Missions/Training/SniperRifle.lua Wed Dec 08 15:10:38 2010 -0500
+++ b/share/hedgewars/Data/Missions/Training/SniperRifle.lua Wed Dec 08 22:35:29 2010 +0100
@@ -174,7 +174,7 @@
AddTeam(loc(teamname), 14483456, "Simple", "Island", "Default")
-- And add a hog to it
player = AddHog(loc(hogname), 0, 1, "Sniper")
- SetGearPosition(player, 602, 1465);
+ SetGearPosition(player, 602, 1465)
end
-- This function is called when the round starts
@@ -190,7 +190,7 @@
-- A negative icon parameter (-n) represents the n-th weapon icon
-- A positive icon paramter (n) represents the (n+1)-th mission icon
-- A timeframe of 0 is replaced with the default time to show.
- ShowMission(loc(caption), loc(subcaption), loc(goal), -amSniperRifle, 0);
+ ShowMission(loc(caption), loc(subcaption), loc(goal), -amSniperRifle, 0)
end
-- This function is called every game tick.
@@ -215,9 +215,9 @@
if TurnTimeLeft == 1 and score < score_goal then
game_lost = true
-- ... and show a short message.
- ShowMission(loc(caption), loc(subcaption), loc(timeout), -amSkip, 0);
+ ShowMission(loc(caption), loc(subcaption), loc(timeout), -amSkip, 0)
-- How about killing our poor hog due to his poor performance?
- SetHealth(player, 0);
+ SetHealth(player, 0)
-- Just to be sure set the goal time to 1 ms
time_goal = 1
end
@@ -381,7 +381,7 @@
else
if not game_lost then
-- Otherwise show that the goal was accomplished
- ShowMission(loc(caption), loc(subcaption), loc(success), 0, 0);
+ ShowMission(loc(caption), loc(subcaption), loc(success), 0, 0)
-- Also let the hogs shout "victory!"
PlaySound(sndVictory)
-- Save the time left so we may keep it.