# HG changeset patch
# User unc0rr
# Date 1387915816 -14400
# Node ID 91bc555c5df4753a6e4da7b1f2730b1bfaf869ed
# Parent  fa94ee96f0067b45cdb5362b4c5651b17c6af8d3# Parent  e89b42c55047a2ac4d18192ed41d14c78adf92b0
merge

diff -r e89b42c55047 -r 91bc555c5df4 gameServer/Utils.hs
--- a/gameServer/Utils.hs	Tue Dec 24 15:07:41 2013 -0500
+++ b/gameServer/Utils.hs	Wed Dec 25 00:10:16 2013 +0400
@@ -92,6 +92,8 @@
             , (44, "0.9.19-dev")
             , (45, "0.9.19")
             , (46, "0.9.20-dev")
+            , (47, "0.9.20")
+            , (48, "0.9.21-dev")
             ]
 
 askFromConsole :: B.ByteString -> IO B.ByteString
diff -r e89b42c55047 -r 91bc555c5df4 hedgewars/uScript.pas
--- a/hedgewars/uScript.pas	Tue Dec 24 15:07:41 2013 -0500
+++ b/hedgewars/uScript.pas	Wed Dec 25 00:10:16 2013 +0400
@@ -2040,6 +2040,7 @@
 ScriptSetInteger('SuddenDeathTurns', cSuddenDTurns);
 ScriptSetInteger('WaterRise', cWaterRise);
 ScriptSetInteger('HealthDecrease', cHealthDecrease);
+ScriptSetInteger('GetAwayTime', cGetAwayTime);
 ScriptSetString('Map', cMapName);
 
 ScriptSetString('Theme', '');
@@ -2068,6 +2069,7 @@
 cSuddenDTurns    := ScriptGetInteger('SuddenDeathTurns');
 cWaterRise       := ScriptGetInteger('WaterRise');
 cHealthDecrease  := ScriptGetInteger('HealthDecrease');
+cGetAwayTime     := ScriptGetInteger('GetAwayTime');
 
 if cMapName <> ScriptGetString('Map') then
     ParseCommand('map ' + ScriptGetString('Map'), true, true);
diff -r e89b42c55047 -r 91bc555c5df4 share/hedgewars/Data/Scripts/Multiplayer/Gravity.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Gravity.cfg	Wed Dec 25 00:10:16 2013 +0400
@@ -0,0 +1,2 @@
+Default
+Default
diff -r e89b42c55047 -r 91bc555c5df4 share/hedgewars/Data/Scripts/Multiplayer/Gravity.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Gravity.lua	Wed Dec 25 00:10:16 2013 +0400
@@ -0,0 +1,33 @@
+HedgewarsScriptLoad("/Scripts/Locale.lua")
+
+local gravity = 100
+local wdGameTicks = 0
+local wdTTL = 0
+
+function onNewTurn()
+    SetGravity(gravity)
+    wdGameTicks = GameTime
+end
+
+function onGameTick20()
+    if (TurnTimeLeft < 20) or (TurnTimeLeft > 0 and wdGameTicks + 15000 < GameTime) then
+        SetGravity(100)
+    elseif wdTTL ~= TurnTimeLeft then
+        wdGameTicks = GameTime
+        SetGravity(gravity)
+    end
+
+    wdTTL = TurnTimeLeft
+end
+
+function onGameInit()
+    gravity = GetAwayTime
+    GetAwayTime = 100
+end
+
+function onGameStart()
+    ShowMission(loc("Gravity"),
+                loc("Current value is ") .. gravity .. "%",
+                loc("Set any gravity value you want by adjusting get away time"),
+                0, 5000)
+end
\ No newline at end of file
diff -r e89b42c55047 -r 91bc555c5df4 share/hedgewars/Data/Scripts/Multiplayer/No_Gravity.cfg
--- a/share/hedgewars/Data/Scripts/Multiplayer/No_Gravity.cfg	Tue Dec 24 15:07:41 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Default
-Default
diff -r e89b42c55047 -r 91bc555c5df4 share/hedgewars/Data/Scripts/Multiplayer/No_Gravity.lua
--- a/share/hedgewars/Data/Scripts/Multiplayer/No_Gravity.lua	Tue Dec 24 15:07:41 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-function onNewTurn()
-    SetGravity(0)
-end
-
-function onGameTick20()
-    if TurnTimeLeft < 20 then
-        SetGravity(100)
-    end
-end