[Freeciv-Dev] (PR#10722) Not enough glasslands/plains

["Marcelo Burda" <mburda@xxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=10722 >

oups! i forget the patch

there is the math to define Xxx_pct vars to be tuned for 2.0, this will
disapear complety in 2.1 when this info will be get from ruleset.

Marcelo

? client/gui-gtk-2.0/stgi6Pnc
? server/.kdbgrc.civserver
Index: server/generator/mapgen.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/generator/mapgen.c,v
retrieving revision 1.15
diff -u -r1.15 mapgen.c
--- server/generator/mapgen.c   15 Oct 2004 09:39:06 -0000      1.15
+++ server/generator/mapgen.c   7 Nov 2004 15:07:10 -0000
@@ -1112,8 +1112,8 @@
 
   mountain_pct = factor * map.steepness * 90;
 
-  /* 40 % if wetness == 50 & */
-  forest_pct = factor * (map.wetness * 60 + 1000) ; 
+  /* 27 % if wetness == 50 & */
+  forest_pct = factor * (map.wetness * 40 + 700) ; 
   jungle_pct = forest_pct * (MAX_COLATITUDE - TROPICAL_LEVEL) /
                (MAX_COLATITUDE * 2);
   forest_pct -= jungle_pct;
@@ -1122,8 +1122,10 @@
   river_pct = (100 - polar) * (3 + map.wetness / 12) / 100;
 
   /* 6 %  if wetness == 50 && temperature == 50 */
-  swamp_pct = factor * (map.wetness * 6 + map.temperature * 6);
-  desert_pct = factor * (map.temperature * 10 + (100 - map.wetness) * 10) ;
+  swamp_pct = factor * MAX(0, 
+                          (map.wetness * 9 - 150 + map.temperature * 6));
+  desert_pct =factor * MAX(0,
+               (map.temperature * 15 - 250 + (100 - map.wetness) * 10)) ;
 }
 
 /****************************************************************************