[Freeciv-Dev] timestep diff

[Peter Schaefer <schaefer@xxxxxxxxxxxxxxxxxxxxxxxxxxx>]

I brought the timescale closer in sync with
civII. As only special feature, the timestep will be 1 once
spaceship technology can be researched.
I remember robotics was needed for SS Modules in civ1, 
but freeciv seems to require Superconductor, so I 
put both in the function.

The diff has been made to non-cvs, but a look at cvs indicates
it will work ok( only the date function is changed ).
A test run with AI indicates it's still possible to get gunpowder
in BC, so there is room left to add 10 to foodboxsize.
--
Peter Schaefer           mailto:schaefer@xxxxxxxxxxxxxxxxxxxxxxxxxxx     
X-Url: http://wwwhoppe.math.uni-augsburg.de/~schaefer/

--- common/game.cold    Mon Nov  9 20:55:57 1998
+++ common/game.c       Thu Nov 12 17:10:40 1998
@@ -398,16 +398,28 @@
   if (game.year == 1) /* hacked it to get rid of year 0 */
     game.year = 0;
 
-  if (game.year < 1000)
-    game.year += 20;
-  else if (game.year < 1500)
-    game.year += 10;
-  else if (game.year < 1700)
-    game.year += 5;
-  else if (game.year < 1800)
+    /* !McFred: 
+       - want game.year += 1 for spaceship.
+    */
+
+  if(game.year >= 1900 
+     || 
+     (( game.global_advances[A_ROBOTICS] || 
game.global_advances[A_SUPERCONDUCTOR] )
+     && game.global_advances[A_PLASTICS] )
+     )
+    game.year += 1;
+  else if(game.year >= 1750 || game.global_advances[A_PLASTICS] )
     game.year += 2;
+  else if(game.year >= 1500 || game.global_advances[A_SPACEFLIGHT] )
+    game.year += 5;
+  else if(game.year >= 1000 )
+    game.year += 10;
+  else if( game.year >= 0 )
+    game.year += 20;
+  else if(game.year >= -1250)
+    game.year += 25;
   else
-    game.year++;
+    game.year += 50; 
 
   if (game.year == 0) 
     game.year = 1;