Fix training script positions altered by variable land dimension change. Issue #453
authornemo
Mon, 29 Oct 2012 14:22:29 -0400
changeset 7877 b3fb94986255
parent 7876 a366fbe91b58
child 7878 2be6c9b89797
Fix training script positions altered by variable land dimension change. issue #453
share/hedgewars/Data/Missions/Training/Basic_Training_-_Bazooka.lua
share/hedgewars/Data/Missions/Training/Basic_Training_-_Cluster_Bomb.lua
share/hedgewars/Data/Missions/Training/Basic_Training_-_Grenade.lua
share/hedgewars/Data/Missions/Training/Basic_Training_-_Shotgun.lua
share/hedgewars/Data/Missions/Training/User_Mission_-_Bamboo_Thicket.lua
share/hedgewars/Data/Missions/Training/User_Mission_-_Dangerous_Ducklings.lua
share/hedgewars/Data/Missions/Training/User_Mission_-_Diver.lua
share/hedgewars/Data/Missions/Training/User_Mission_-_Newton_and_the_Hammock.lua
share/hedgewars/Data/Missions/Training/User_Mission_-_RCPlane_Challenge.lua
share/hedgewars/Data/Missions/Training/User_Mission_-_Spooky_Tree.lua
share/hedgewars/Data/Missions/Training/User_Mission_-_Teamwork.lua
share/hedgewars/Data/Missions/Training/User_Mission_-_The_Great_Escape.lua
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Bazooka.lua	Mon Oct 29 18:17:36 2012 +0100
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Bazooka.lua	Mon Oct 29 14:22:29 2012 -0400
@@ -46,7 +46,7 @@
 	-- move the target to a higher vertical position
 	-- to ensure it's not somewhere down below
 	x, y = GetGearPosition(gear)
-	SetGearPosition(gear, x, 500)
+	SetGearPosition(gear, x, 0)
 end
 
 -- This function is called before the game loads its
@@ -84,7 +84,7 @@
 	AddTeam(loc("'Zooka Team"), 14483456, "Simple", "Island", "Default")
 	-- And add a hog to it
 	player = AddHog(loc("Hunter"), 0, 1, "NoHat")
-	SetGearPosition(player, 1960, 1160)
+	SetGearPosition(player, 936, 136)
 end
 
 -- This function is called when the round starts
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Cluster_Bomb.lua	Mon Oct 29 18:17:36 2012 +0100
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Cluster_Bomb.lua	Mon Oct 29 14:22:29 2012 -0400
@@ -10,23 +10,23 @@
 
 	gear = AddGear(0, 0, gtTarget, 0, 0, 0, 0)
 	
-	if scored == 0 then x = 1652 end
-	if scored == 1 then x = 1915 end
-	if scored == 2 then x = 2333 end
-	if scored == 3 then x = 2152 end
-	if scored == 4 then x = 1434 end
-	if scored == 5 then x = 2588 end
-	if scored == 6 then x = 2372 end
-	if scored == 7 then x = 1193 end
-	if scored == 8 then x = 2744 end
-	if scored == 9 then x = 2465 end
-	if scored == 10 then x = 1623 end
-	if scored == 11 then x = 2662 end
+	if scored == 0 then x = 628 end
+	if scored == 1 then x = 891 end
+	if scored == 2 then x = 1309 end
+	if scored == 3 then x = 1128 end
+	if scored == 4 then x = 410 end
+	if scored == 5 then x = 1564 end
+	if scored == 6 then x = 1348 end
+	if scored == 7 then x = 169 end
+	if scored == 8 then x = 1720 end
+	if scored == 9 then x = 1441 end
+	if scored == 10 then x = 599 end
+	if scored == 11 then x = 1638 end
 
 	if scored == 6 then
-		SetGearPosition(gear, 2272, 1500)
+		SetGearPosition(gear, 1248, 476)
 	else
-		SetGearPosition(gear, x, 1000)
+		SetGearPosition(gear, x, 0)
 	end
 
 end
@@ -46,7 +46,7 @@
 	AddTeam("The Hogies", 2850005, "Statue", "Island", "Hog Islands")
 
 	player = AddHog(loc("Private Novak"), 0, 1, "war_desertGrenadier1")
-	SetGearPosition(player, 1780, 1300)
+	SetGearPosition(player, 756, 370)
 
 end
 
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Grenade.lua	Mon Oct 29 18:17:36 2012 +0100
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Grenade.lua	Mon Oct 29 14:22:29 2012 -0400
@@ -44,12 +44,12 @@
 	
 	-- move it to a random position within 0 and
 	-- LAND_WIDTH - the width of the map
-	FindPlace(gear, true, 0, LAND_WIDTH-1350)
+	FindPlace(gear, true, 0, LAND_WIDTH-326)
 	
 	-- move the target to a higher vertical position
 	-- to ensure it's not somewhere down below
 	x, y = GetGearPosition(gear)
-	SetGearPosition(gear, x, 500)
+	SetGearPosition(gear, x, 0)
 end
 
 -- This function is called before the game loads its
@@ -87,7 +87,7 @@
 	AddTeam(loc("Grenadiers"), 14483456, "Simple", "Island", "Default")
 	-- And add a hog to it
 	player = AddHog(loc("Nade Boy"), 0, 1, "war_grenadier1")
-	SetGearPosition(player, 1530, 1100)
+	SetGearPosition(player, 506, 76)
 end
 
 -- This function is called when the round starts
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Shotgun.lua	Mon Oct 29 18:17:36 2012 +0100
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Shotgun.lua	Mon Oct 29 14:22:29 2012 -0400
@@ -46,7 +46,7 @@
 	-- move the target to a higher vertical position
 	-- to ensure it's not somewhere down below
 	x, y = GetGearPosition(gear)
-	SetGearPosition(gear, x, 500)
+	SetGearPosition(gear, x, 0)
 end
 
 function onNewTurn()
@@ -88,7 +88,7 @@
 	AddTeam(loc("Shotgun Team"), 14483456, "Simple", "Island", "Default")
 	-- And add a hog to it
 	player = AddHog(loc("Hunter"), 0, 1, "NoHat")
-	SetGearPosition(player, 2334, 1254)
+	SetGearPosition(player, 1210, 230)
 end
 
 -- This function is called when the round starts
--- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Bamboo_Thicket.lua	Mon Oct 29 18:17:36 2012 +0100
+++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Bamboo_Thicket.lua	Mon Oct 29 14:22:29 2012 -0400
@@ -26,8 +26,8 @@
 	AddTeam(loc("Cybernetic Empire"), 	1175851, "Simple", "Island", "Default")
 	enemy = AddHog(loc("Unit 835"), 1, 10, "cyborg1")
 
-	SetGearPosition(player,1166,1680)
-	SetGearPosition(enemy,2848,1443)
+	SetGearPosition(player,142,656)
+	SetGearPosition(enemy,1824,419)
 
 end
 
@@ -37,10 +37,10 @@
 	ShowMission(loc("Bamboo Thicket"), loc("User Challenge"), loc("Eliminate the enemy before the time runs out"), -amBazooka, 0)
 
 	--WEAPON CRATE LIST. WCRATES: 1
-	SpawnAmmoCrate(1915,1876,amBazooka)
+	SpawnAmmoCrate(891,852,amBazooka)
 	--UTILITY CRATE LIST. UCRATES: 2
-	SpawnUtilityCrate(1986,1141,amBlowTorch)
-	SpawnUtilityCrate(1427,1527,amParachute)
+	SpawnUtilityCrate(962,117,amBlowTorch)
+	SpawnUtilityCrate(403,503,amParachute)
 
 	AddAmmo(enemy, amGrenade, 100)
 		
--- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Dangerous_Ducklings.lua	Mon Oct 29 18:17:36 2012 +0100
+++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Dangerous_Ducklings.lua	Mon Oct 29 14:22:29 2012 -0400
@@ -40,9 +40,9 @@
 	AddTeam("Blue Team", 29439, "Simple", "Island", "Default")
 	enemy = AddHog("Filthy Blue", 1, 100, "Skull")
 
-	SetGearPosition(player, 1170, 1926)
-	SetGearPosition(instructor, 1341, 1926)
-	SetGearPosition(enemy, 2942, 1861)
+	SetGearPosition(player,146,902)
+	SetGearPosition(instructor,317,902)
+	SetGearPosition(enemy,1918,837)
 
 
 	HogSay(player, ".............................", SAY_THINK)
@@ -54,8 +54,8 @@
 
 function onGameStart()
 
-	SpawnAmmoCrate(1499,1500,amRope)
-	SpawnAmmoCrate(2753,1500,amFirePunch)
+	SpawnAmmoCrate(475,476,amRope)
+	SpawnAmmoCrate(1729,476,amFirePunch)
 
 	FollowGear(player)
 
--- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Diver.lua	Mon Oct 29 18:17:36 2012 +0100
+++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Diver.lua	Mon Oct 29 14:22:29 2012 -0400
@@ -28,8 +28,8 @@
 	AddTeam(loc("Toxic Team"), 	1175851, "Simple", "Island", "Default")
 	enemy = AddHog(loc("Poison"), 1, 100, "Skull")
 
-	SetGearPosition(player, 1454, 1540)
-	SetGearPosition(enemy, 2488, 1960)
+	SetGearPosition(player,430,516)
+	SetGearPosition(enemy,1464,936)
 
 end
 
@@ -37,12 +37,12 @@
 function onGameStart()
 
 
-	SpawnAmmoCrate(1450,1910,amJetpack)
-	SpawnAmmoCrate(2568,1714,amFirePunch)
-	SpawnAmmoCrate(1974,1875,amBlowTorch)
-	SpawnAmmoCrate(2056,1877,amParachute)
+	SpawnAmmoCrate(426,886,amJetpack)
+	SpawnAmmoCrate(1544,690,amFirePunch)
+	SpawnAmmoCrate(950,851,amBlowTorch)
+	SpawnAmmoCrate(1032,853,amParachute)
 
-	AddGear(1603, 1320, gtMine, 0, 0, 0, 0)
+	AddGear(579, 296, gtMine, 0, 0, 0, 0)
 
 	ShowMission(loc("Operation Diver"), "", loc("Eliminate Poison before the time runs out") .. loc("|- Mines Time:") .. " " .. 1 .. " " .. loc("sec"), -amFirePunch, 0);
 	--SetTag(AddGear(0, 0, gtATSmoothWindCh, 0, 0, 0, 1), -70)
--- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Newton_and_the_Hammock.lua	Mon Oct 29 18:17:36 2012 +0100
+++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Newton_and_the_Hammock.lua	Mon Oct 29 14:22:29 2012 -0400
@@ -27,8 +27,8 @@
 	AddTeam(loc("Cybernetic Empire"), 	1175851, "Simple", "Island", "Default")
 	enemy = AddHog(loc("Unit") .. " 811", 1, 100, "cyborg1")
 
-	SetGearPosition(player, 1454, 1540)
-	SetGearPosition(enemy, 2488, 1960)
+	SetGearPosition(player,430,1540)
+	SetGearPosition(enemy,1464,1960)
 
 end
 
@@ -39,57 +39,57 @@
 	AddAmmo(enemy, amFirePunch, 100)
 
 	--GIRDER LIST. 
-	PlaceGirder(2097,2009,0)
-	PlaceGirder(1548,1487,3)
-	PlaceGirder(1662,1453,4)
-	PlaceGirder(1785,1453,0)
-	PlaceGirder(1864,1421,3)
-	PlaceGirder(1326,1388,6)
-	PlaceGirder(1351,1506,1)
-	PlaceGirder(2693,1832,3)
+	PlaceGirder(1073,2009,0)
+	PlaceGirder(524,1487,3)
+	PlaceGirder(638,1453,4)
+	PlaceGirder(761,1453,0)
+	PlaceGirder(840,1421,3)
+	PlaceGirder(302,1388,6)
+	PlaceGirder(327,1506,1)
+	PlaceGirder(1669,1832,3)
 	--MINE LIST. 
-	AddGear(2080,1987,gtMine, 0, 0, 0, 0)
-	AddGear(2110,1988,gtMine, 0, 0, 0, 0)
+	AddGear(1056,1987,gtMine, 0, 0, 0, 0)
+	AddGear(1086,1988,gtMine, 0, 0, 0, 0)
 	--STICKY MINE LIST. 
-	AddGear(2113,965,gtSMine, 0, 0, 0, 0)
-	AddGear(2157,945,gtSMine, 0, 0, 0, 0)	
-	AddGear(2034,1081,gtSMine, 0, 0, 0, 0)
-	AddGear(2060,1049,gtSMine, 0, 0, 0, 0)
-	AddGear(2081,1004,gtSMine, 0, 0, 0, 0)
-	AddGear(1808,1252,gtSMine, 0, 0, 0, 0)
-	AddGear(1865,1257,gtSMine, 0, 0, 0, 0)
-	AddGear(1926,1263,gtSMine, 0, 0, 0, 0)
-	AddGear(1976,1281,gtSMine, 0, 0, 0, 0)
-	AddGear(1541,1546,gtSMine, 0, 0, 0, 0)
-	AddGear(1583,1597,gtSMine, 0, 0, 0, 0)
-	AddGear(1637,1650,gtSMine, 0, 0, 0, 0)
-	AddGear(1698,1705,gtSMine, 0, 0, 0, 0)
-	AddGear(1770,1692,gtSMine, 0, 0, 0, 0)
-	AddGear(1834,1692,gtSMine, 0, 0, 0, 0)
-	AddGear(1896,1673,gtSMine, 0, 0, 0, 0)
-	AddGear(1957,1666,gtSMine, 0, 0, 0, 0)
-	AddGear(2005,1662,gtSMine, 0, 0, 0, 0)
-	AddGear(2040,1634,gtSMine, 0, 0, 0, 0)
-	AddGear(2087,1595,gtSMine, 0, 0, 0, 0)
-	AddGear(2124,1574,gtSMine, 0, 0, 0, 0)
-	AddGear(2026,1461,gtSMine, 0, 0, 0, 0)
-	AddGear(2076,1438,gtSMine, 0, 0, 0, 0)
-	AddGear(2126,1464,gtSMine, 0, 0, 0, 0)
+	AddGear(1089,965,gtSMine, 0, 0, 0, 0)
+	AddGear(1133,945,gtSMine, 0, 0, 0, 0)	
+	AddGear(1010,1081,gtSMine, 0, 0, 0, 0)
+	AddGear(1036,1049,gtSMine, 0, 0, 0, 0)
+	AddGear(1057,1004,gtSMine, 0, 0, 0, 0)
+	AddGear(784,1252,gtSMine, 0, 0, 0, 0)
+	AddGear(841,1257,gtSMine, 0, 0, 0, 0)
+	AddGear(902,1263,gtSMine, 0, 0, 0, 0)
+	AddGear(952,1281,gtSMine, 0, 0, 0, 0)
+	AddGear(517,1546,gtSMine, 0, 0, 0, 0)
+	AddGear(559,1597,gtSMine, 0, 0, 0, 0)
+	AddGear(613,1650,gtSMine, 0, 0, 0, 0)
+	AddGear(674,1705,gtSMine, 0, 0, 0, 0)
+	AddGear(746,1692,gtSMine, 0, 0, 0, 0)
+	AddGear(810,1692,gtSMine, 0, 0, 0, 0)
+	AddGear(872,1673,gtSMine, 0, 0, 0, 0)
+	AddGear(933,1666,gtSMine, 0, 0, 0, 0)
+	AddGear(981,1662,gtSMine, 0, 0, 0, 0)
+	AddGear(1016,1634,gtSMine, 0, 0, 0, 0)
+	AddGear(1063,1595,gtSMine, 0, 0, 0, 0)
+	AddGear(1100,1574,gtSMine, 0, 0, 0, 0)
+	AddGear(1002,1461,gtSMine, 0, 0, 0, 0)
+	AddGear(1052,1438,gtSMine, 0, 0, 0, 0)
+	AddGear(1102,1464,gtSMine, 0, 0, 0, 0)
 	--WEAPON CRATE LIST. 
-	SpawnAmmoCrate(2589,642,amSineGun)
-	SpawnAmmoCrate(1572,858,amBazooka)
+	SpawnAmmoCrate(1565,642,amSineGun)
+	SpawnAmmoCrate(548,858,amBazooka)
 	--UTILITY CRATE LIST.
-	SpawnUtilityCrate(1503,847,amJetpack)
-	SpawnUtilityCrate(2574,1715,amBlowTorch)
-	SpawnUtilityCrate(2251,1941,amJetpack)
-	SpawnUtilityCrate(2094,1964,amInvulnerable)
-	SpawnUtilityCrate(2094,1875,amTeleport)
+	SpawnUtilityCrate(479,847,amJetpack)
+	SpawnUtilityCrate(1550,1715,amBlowTorch)
+	SpawnUtilityCrate(1227,1941,amJetpack)
+	SpawnUtilityCrate(1070,1964,amInvulnerable)
+	SpawnUtilityCrate(1070,1875,amTeleport)
 	--HOG POSITION LIST.
 	if hhs[0] ~= nil then
-       		 SetGearPosition(hhs[0],1421,865)
+       		 SetGearPosition(hhs[0],397,865)
 	end
 		if hhs[1] ~= nil then
-        	SetGearPosition(hhs[1],1585,1365)
+        	SetGearPosition(hhs[1],561,1365)
 	end
 
 	ShowMission(loc("Newton's Hammock"), loc("User Challenge"), loc("Eliminate the enemy before the time runs out"), -amParachute, 0)
--- a/share/hedgewars/Data/Missions/Training/User_Mission_-_RCPlane_Challenge.lua	Mon Oct 29 18:17:36 2012 +0100
+++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_RCPlane_Challenge.lua	Mon Oct 29 14:22:29 2012 -0400
@@ -275,13 +275,13 @@
 
 end
 
-function onGameTick()
+--function onGameTick()
 
 	--if RCGear ~= nil then
 	--	AddCaption(GetTimer(RCGear))
 	--end
 
-end
+--end
 
 function onNewTurn()
 	TurnTimeLeft = -1
--- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Spooky_Tree.lua	Mon Oct 29 18:17:36 2012 +0100
+++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Spooky_Tree.lua	Mon Oct 29 14:22:29 2012 -0400
@@ -34,8 +34,8 @@
 	AddTeam(loc("Toxic Team"), 	1175851, "Simple", "Island", "Default")
 	enemy = AddHog(loc("Poison"), 1, 10, "Skull")
 
-	SetGearPosition(player, 1994, 1047)
-	SetGearPosition(enemy, 1522, 1830)
+	SetGearPosition(player,970,23)
+	SetGearPosition(enemy,498,806)
 
 end
 
@@ -43,42 +43,42 @@
 function onGameStart()
 
 	--right side mines
-	AddGear(2705, 1383, gtMine, 0, 0, 0, 0)
-	AddGear(2742, 1542, gtMine, 0, 0, 0, 0)
-	AddGear(2672, 1551, gtMine, 0, 0, 0, 0)
-	AddGear(2608, 1546, gtMine, 0, 0, 0, 0)
+	AddGear(1681,359,gtMine, 0, 0, 0, 0)
+	AddGear(1718,518,gtMine, 0, 0, 0, 0)
+	AddGear(1648,527,gtMine, 0, 0, 0, 0)
+	AddGear(1584,522,gtMine, 0, 0, 0, 0)
 
 	--tunnel mines
-	AddGear(1325, 1593, gtSMine, 0, 0, 0, 0)
-	AddGear(1396, 1632, gtSMine, 0, 0, 0, 0)
-	AddGear(1477, 1652, gtSMine, 0, 0, 0, 0)
-	AddGear(1548, 1635, gtSMine, 0, 0, 0, 0)
-	AddGear(1637, 1635, gtSMine, 0, 0, 0, 0)
+	AddGear(301,569,gtSMine, 0, 0, 0, 0)
+	AddGear(372,608,gtSMine, 0, 0, 0, 0)
+	AddGear(453,628,gtSMine, 0, 0, 0, 0)
+	AddGear(524,611,gtSMine, 0, 0, 0, 0)
+	AddGear(613,611,gtSMine, 0, 0, 0, 0)
 
-	AddGear(1332, 1510, gtSMine, 0, 0, 0, 0)
-	AddGear(1396, 1502, gtSMine, 0, 0, 0, 0)
-	AddGear(1477, 1490, gtSMine, 0, 0, 0, 0)
-	AddGear(1548, 1495, gtSMine, 0, 0, 0, 0)
-	AddGear(1637, 1490, gtSMine, 0, 0, 0, 0)
+	AddGear(308,486,gtSMine, 0, 0, 0, 0)
+	AddGear(372,478,gtSMine, 0, 0, 0, 0)
+	AddGear(453,466,gtSMine, 0, 0, 0, 0)
+	AddGear(524,471,gtSMine, 0, 0, 0, 0)
+	AddGear(613,466,gtSMine, 0, 0, 0, 0)
 
 	--above the tunnel mines
-	AddGear(1355, 1457, gtMine, 0, 0, 0, 0)
-	AddGear(1428, 1444, gtMine, 0, 0, 0, 0)
-	AddGear(1508, 1448, gtMine, 0, 0, 0, 0)
-	AddGear(1586, 1441, gtMine, 0, 0, 0, 0)
-	AddGear(1664, 1436, gtMine, 0, 0, 0, 0)
+	AddGear(331,433,gtMine, 0, 0, 0, 0)
+	AddGear(404,420,gtMine, 0, 0, 0, 0)
+	AddGear(484,424,gtMine, 0, 0, 0, 0)
+	AddGear(562,417,gtMine, 0, 0, 0, 0)
+	AddGear(640,412,gtMine, 0, 0, 0, 0)
 
 	-- crates crates and more crates
-	SpawnAmmoCrate(2232,1600,amBlowTorch)
-	SpawnAmmoCrate(2491,1400,amPickHammer)
-	SpawnUtilityCrate(1397,1189,amGirder)
-	SpawnUtilityCrate(1728,1647,amJetpack)
-	SpawnUtilityCrate(2670,1773,amLaserSight)
+	SpawnAmmoCrate(1208,576,amBlowTorch)
+	SpawnAmmoCrate(1467,376,amPickHammer)
+	SpawnUtilityCrate(373,165,amGirder)
+	SpawnUtilityCrate(704,623,amJetpack)
+	SpawnUtilityCrate(1646,749,amLaserSight)
 
-	SpawnAmmoCrate(1769,1442,amShotgun) --shotgun1
-	SpawnAmmoCrate(1857,1456,amFirePunch) --fire punch
-	GirderCrate = SpawnAmmoCrate(2813,1538,amShotgun) -- final shotgun
-	SpawnAmmoCrate(2205,1443,amBee)
+	SpawnAmmoCrate(745,418,amShotgun) --shotgun1
+	SpawnAmmoCrate(833,432,amFirePunch) --fire punch
+	GirderCrate = SpawnAmmoCrate(1789,514,amShotgun) -- final shotgun
+	SpawnAmmoCrate(1181,419,amBee)
 
 	ShowMission(loc("Spooky Tree"), "", loc("Eliminate all enemies") .. loc("|- Mines Time:") .. " " .. 0 .. " " .. loc("sec"), -amBee, 0)
 
@@ -92,12 +92,12 @@
 
 	if CurrentHedgehog ~= nil then
 
-		if (birdSqualk == false) and (GetX(CurrentHedgehog) == 2126) and (GetY(CurrentHedgehog) == 1157)  then
+		if (birdSqualk == false) and (GetX(CurrentHedgehog) == 1102) and (GetY(CurrentHedgehog) == 133)  then
 			birdSqualk = true
 			PlaySound(sndBirdyLay)
 		end
 
-		if (birdSpeech == false) and (GetX(CurrentHedgehog) == 2092) and (GetY(CurrentHedgehog) == 1186) then
+		if (birdSpeech == false) and (GetX(CurrentHedgehog) == 1068) and (GetY(CurrentHedgehog) == 162) then
 			birdSpeech = true
 			HogSay(player,loc("Good birdy......"),SAY_THINK)
 		end
--- a/share/hedgewars/Data/Missions/Training/User_Mission_-_Teamwork.lua	Mon Oct 29 18:17:36 2012 +0100
+++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_Teamwork.lua	Mon Oct 29 14:22:29 2012 -0400
@@ -30,9 +30,9 @@
 	AddTeam(loc("Cybernetic Empire"), 	1175851, "Simple", "Island", "Robot", "cm_binary")
 	enemy = AddHog(loc("Unit 3378"), 5, 30, "cyborg1")
 
-	SetGearPosition(player, 2427, 1259)
-	SetGearPosition(p2, 2293, 1263)
-	SetGearPosition(enemy, 1516, 1519)
+	SetGearPosition(player,1403,235)
+	SetGearPosition(p2,1269,239)
+	SetGearPosition(enemy,492,495)
 
 end
 
@@ -40,43 +40,43 @@
 function onGameStart()
 
 	--mines
-	AddGear(1300, 1100, gtMine, 0, 0, 0, 0)
-	AddGear(1325, 1100, gtMine, 0, 0, 0, 0)
-	AddGear(1350, 1100, gtMine, 0, 0, 0, 0)
-	AddGear(1375, 1100, gtMine, 0, 0, 0, 0)
-	AddGear(1400, 1100, gtMine, 0, 0, 0, 0)
-	AddGear(1425, 1100, gtMine, 0, 0, 0, 0)
-	AddGear(1450, 1100, gtMine, 0, 0, 0, 0)
-	AddGear(1475, 1100, gtMine, 0, 0, 0, 0)
-	AddGear(1500, 1100, gtMine, 0, 0, 0, 0)
+	AddGear(276,76,gtMine, 0, 0, 0, 0)
+	AddGear(301,76,gtMine, 0, 0, 0, 0)
+	AddGear(326,76,gtMine, 0, 0, 0, 0)
+	AddGear(351,76,gtMine, 0, 0, 0, 0)
+	AddGear(376,76,gtMine, 0, 0, 0, 0)
+	AddGear(401,76,gtMine, 0, 0, 0, 0)
+	AddGear(426,76,gtMine, 0, 0, 0, 0)
+	AddGear(451,76,gtMine, 0, 0, 0, 0)
+	AddGear(476,76,gtMine, 0, 0, 0, 0)
 
-	AddGear(1910, 1380, gtMine, 0, 0, 0, 0)
-	AddGear(1925, 1380, gtMine, 0, 0, 0, 0)
-	AddGear(1950, 1380, gtMine, 0, 0, 0, 0)
-	AddGear(1975, 1380, gtMine, 0, 0, 0, 0)
-	AddGear(2000, 1380, gtMine, 0, 0, 0, 0)
-	AddGear(2025, 1380, gtMine, 0, 0, 0, 0)
+	AddGear(886,356,gtMine, 0, 0, 0, 0)
+	AddGear(901,356,gtMine, 0, 0, 0, 0)
+	AddGear(926,356,gtMine, 0, 0, 0, 0)
+	AddGear(951,356,gtMine, 0, 0, 0, 0)
+	AddGear(976,356,gtMine, 0, 0, 0, 0)
+	AddGear(1001,356,gtMine, 0, 0, 0, 0)
 
 	-- crates crates and more crates
-	bCrate = SpawnAmmoCrate(2712,1500,amBaseballBat)
-	SpawnUtilityCrate(1596,1167,amGirder)
-	SpawnAmmoCrate(2728,1978,amPickHammer)
-	SpawnAmmoCrate(1728,1647,amBlowTorch)
-	SpawnUtilityCrate(2567,1768,amJetpack)
-	SpawnAmmoCrate(1251,1466,amDrill)
+	bCrate = SpawnAmmoCrate(1688,476,amBaseballBat)
+	SpawnUtilityCrate(572,143,amGirder)
+	SpawnAmmoCrate(1704,954,amPickHammer)
+	SpawnAmmoCrate(704,623,amBlowTorch)
+	SpawnUtilityCrate(1543,744,amJetpack)
+	SpawnAmmoCrate(227,442,amDrill)
 
 	ShowMission(loc("Codename: Teamwork"), "", loc("- Eliminate Unit 3378 |- Feeble Resistance must survive") .. loc("|- Mines Time:") .. " " .. 0 .. " " .. loc("sec"), 0, 0)
 
 end
 
 
-function onGameTick()
+--function onGameTick()
 
 	--if CurrentHedgehog ~= nil then
 	--	AddCaption(GetX(CurrentHedgehog) .. ";" .. GetY(CurrentHedgehog))
 	--end
 
-end
+--end
 
 
 function onAmmoStoreInit()
--- a/share/hedgewars/Data/Missions/Training/User_Mission_-_The_Great_Escape.lua	Mon Oct 29 18:17:36 2012 +0100
+++ b/share/hedgewars/Data/Missions/Training/User_Mission_-_The_Great_Escape.lua	Mon Oct 29 14:22:29 2012 -0400
@@ -29,64 +29,64 @@
 ShowMission(loc("The Great Escape"), loc("Get out of there!"), loc("Elimate your captor."), -amGrenade, 0)
 
 ------ GIRDER LIST ------
-PlaceGirder(2066, 1588, 0)
-PlaceGirder(2052, 1498, 6)
-PlaceGirder(2098, 1498, 6)
-PlaceGirder(2074, 1409, 0)
-PlaceGirder(2199, 1755, 7)
-PlaceGirder(2476, 1929, 2)
-PlaceGirder(2546, 1879, 4)
-PlaceGirder(2520, 1924, 3)
-PlaceGirder(2706, 1879, 4)
-PlaceGirder(2797, 1911, 2)
-PlaceGirder(2671, 1925, 1)
-PlaceGirder(2895, 1907, 6)
-PlaceGirder(2895, 1747, 6)
-PlaceGirder(2798, 1792, 6)
-PlaceGirder(2797, 1791, 6)
-PlaceGirder(2845, 1928, 1)
-PlaceGirder(2846, 1826, 3)
-PlaceGirder(2844, 1747, 1)
-PlaceGirder(2806, 1702, 4)
-PlaceGirder(2846, 1685, 0)
-PlaceGirder(2846, 1668, 0)
-PlaceGirder(2766, 1668, 0)
-PlaceGirder(2766, 1685, 0)
-PlaceGirder(2718, 1700, 2)
-PlaceGirder(2927, 1659, 0)
+PlaceGirder(1042,564,0)
+PlaceGirder(1028,474,6)
+PlaceGirder(1074,474,6)
+PlaceGirder(1050,385,0)
+PlaceGirder(1175,731,7)
+PlaceGirder(1452,905,2)
+PlaceGirder(1522,855,4)
+PlaceGirder(1496,900,3)
+PlaceGirder(1682,855,4)
+PlaceGirder(1773,887,2)
+PlaceGirder(1647,901,1)
+PlaceGirder(1871,883,6)
+PlaceGirder(1871,723,6)
+PlaceGirder(1774,768,6)
+PlaceGirder(1773,767,6)
+PlaceGirder(1821,904,1)
+PlaceGirder(1822,802,3)
+PlaceGirder(1820,723,1)
+PlaceGirder(1782,678,4)
+PlaceGirder(1822,661,0)
+PlaceGirder(1822,644,0)
+PlaceGirder(1742,644,0)
+PlaceGirder(1742,661,0)
+PlaceGirder(1694,676,2)
+PlaceGirder(1903,635,0)
 ------ HEALTH CRATE LIST ------
-SpawnHealthCrate(2500, 1193)
-SpawnHealthCrate(2575, 1201)
-SpawnHealthCrate(2610, 1224)
-SpawnHealthCrate(2463, 1213)
-SpawnHealthCrate(2425, 1235)
-SpawnHealthCrate(2657, 1234)
+SpawnHealthCrate(1476,169)
+SpawnHealthCrate(1551,177)
+SpawnHealthCrate(1586,200)
+SpawnHealthCrate(1439,189)
+SpawnHealthCrate(1401,211)
+SpawnHealthCrate(1633,210)
 ------ MINE LIST ------
-tempG = AddGear(2034, 1704, gtMine, 0, 0, 0, 0)
+tempG = AddGear(1010,680,gtMine, 0, 0, 0, 0)
 SetTimer(tempG, 1)
-tempG = AddGear(2055, 1744, gtMine, 0, 0, 0, 0)
+tempG = AddGear(1031,720,gtMine, 0, 0, 0, 0)
 SetTimer(tempG, 1)
-tempG = AddGear(2063, 1772, gtMine, 0, 0, 0, 0)
+tempG = AddGear(1039,748,gtMine, 0, 0, 0, 0)
 SetTimer(tempG, 1)
-tempG = AddGear(2075, 1801, gtMine, 0, 0, 0, 0)
+tempG = AddGear(1051,777,gtMine, 0, 0, 0, 0)
 SetTimer(tempG, 1)
-tempG = AddGear(2089, 1820, gtMine, 0, 0, 0, 0)
+tempG = AddGear(1065,796,gtMine, 0, 0, 0, 0)
 SetTimer(tempG, 1)
-tempG = AddGear(2118, 1824, gtMine, 0, 0, 0, 0)
+tempG = AddGear(1094,800,gtMine, 0, 0, 0, 0)
 SetTimer(tempG, 1)
 ------ REPOSITION LIST ------
-SetGearPosition(player, 2074, 1558)
-SetGearPosition(enemy, 2536, 1182)
+SetGearPosition(player,1050,534)
+SetGearPosition(enemy,1512,158)
 SetHealth(player, 1)
 SetHealth(enemy, 1)
 ------ AMMO CRATE LIST ------
-SpawnAmmoCrate(2656, 1967, 5)
-SpawnAmmoCrate(2747, 1912, 12)
-SpawnAmmoCrate(2939, 1623, 1)
+SpawnAmmoCrate(1632,943,5)
+SpawnAmmoCrate(1723,888,12)
+SpawnAmmoCrate(1915,599,1)
 ------ UTILITY CRATE LIST ------
-SpawnUtilityCrate(2543, 1969, 15)
-SpawnUtilityCrate(2251, 1664, 6)
-SpawnUtilityCrate(2440, 1937, 18)
+SpawnUtilityCrate(1519,945,15)
+SpawnUtilityCrate(1227,640,6)
+SpawnUtilityCrate(1416,913,18)
 ------ END LOADING DATA ------
 
 end