[Freeciv-Dev] Re: (PR#10091) Game balance adjustment

["Per I. Mathisen" <per@xxxxxxxxxxx>]

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

CHANGES
 - Newton's now increases efficiency of University by 100 (instead of
adding 200% to science as in previous version).
 - For Republic and Democracy, cities get trade tile bonuses if they
celebrate, similar to Monarchy and Communism.
 - Set researchcost to 10 in civ1.serv and civ2.serv (I do not know what
to do for history.ruleset, I guess those who feel the call will submit a
patch)

Needs comments & testing.

  - Per

Index: data/civ1.serv
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/civ1.serv,v
retrieving revision 1.9
diff -u -r1.9 civ1.serv
--- data/civ1.serv      3 Jul 2004 17:11:34 -0000       1.9
+++ data/civ1.serv      20 Sep 2004 13:56:42 -0000
@@ -3,6 +3,7 @@
 # Use this as, eg, "./ser -r data/civ1.serv" 
 #
 # Civ1 start:
+set researchcost 10
 set startunits c
 rulesetdir civ1
 #
Index: data/civ2.serv
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/civ2.serv,v
retrieving revision 1.7
diff -u -r1.7 civ2.serv
--- data/civ2.serv      3 Jul 2004 17:11:34 -0000       1.7
+++ data/civ2.serv      20 Sep 2004 13:56:42 -0000
@@ -3,6 +3,7 @@
 # Use this as, eg, "./ser -r data/civ2.serv" 
 #
 # Civ2 start:
+set researchcost 10
 set startunits cc
 rulesetdir civ2
 #
Index: data/default/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/default/buildings.ruleset,v
retrieving revision 1.53
diff -u -r1.53 buildings.ruleset
--- data/default/buildings.ruleset      17 Sep 2004 00:54:07 -0000      1.53
+++ data/default/buildings.ruleset      20 Sep 2004 13:56:43 -0000
@@ -91,14 +91,6 @@
       "Cathedral", "City"
     }
 
-[group_labs]
-name           = "Labs"
-elements       =
-    { "building", "range"
-      "SETI Program", "Player"
-      "Research Lab", "City"
-    }
-
 [group_generators]
 name           = "Generators"
 elements       =
@@ -627,14 +619,16 @@
 upkeep         = 1
 sabotage       = 100
 effect         =
-    { "name", "value"
-      "Science_Bonus", 50
+    { "name", "value", "req_type", "req"
+      "Science_Bonus", 100
+      "Science_Bonus", 100, "Gov", "Republic"
+      "Science_Bonus", 100, "Gov", "Democracy"
     }
 sound          = "b_library"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
 helptext       = _("\
-Increases the science output in a city by 50%.\
+Increases the science output in a city by 100%.\
 ")
 
 [building_marketplace]
@@ -654,9 +648,13 @@
 upkeep         = 0
 sabotage       = 100
 effect         =
-    { "name", "value"
+    { "name", "value", "req_type", "req"
       "Tax_Bonus", 50
       "Luxury_Bonus", 50
+      "Tax_Bonus", 50, "Gov", "Republic"
+      "Luxury_Bonus", 50, "Gov", "Republic"
+      "Tax_Bonus", 50, "Gov", "Democracy"
+      "Luxury_Bonus", 50, "Gov", "Democracy"
     }
 sound          = "b_marketplace"
 sound_alt      = "b_generic"
@@ -967,23 +965,24 @@
 ;spec_gate     =
 equiv_range    = "City"
 ;equiv_dupl    =
-equiv_repl     = "SETI Program"
+;equiv_repl    = 
 obsolete_by    = "None"
 is_wonder      = 0
 build_cost     = 120
 upkeep         = 3
 sabotage       = 100
 effect         =
-    { "name", "value", "equiv", "req_type", "req"
-       "Science_Bonus", 50, "Labs", "Building", "Library"
+    { "name", "value", "req_type", "req"
+       "Science_Bonus", 100, "Building", "Library"
+       "Science_Bonus", 100, "Building", "University"
     }
 sound          = "b_research_lab"
 sound_alt      = "b_generic"
 helptext       = _("\
 Together with a Library, a Research Lab increases the science\
- production of a city by 100%. \
+ production of a city by 200%. \
 Together with a Library and a University, a Research Lab increases\
- the science production of a city by 150%.\
+ the science production of a city by 450%.\
 ")
 
 [building_sam_battery]
@@ -1344,14 +1343,14 @@
 sabotage       = 100
 effect         =
     { "name", "value", "req_type", "req"
-      "Science_Bonus", 50, "Building", "Library"
+      "Science_Bonus", 150, "Building", "Library"
     }
 sound          = "b_university"
 sound_alt      = "b_generic"
 ; /* xgettext:no-c-format */
 helptext       = _("\
 Together with a Library, a University increases the science\
- production of a city by 100%.\
+ production of a city by 250%.\
 ")
 
 [building_apollo_program]
@@ -1455,13 +1454,13 @@
 sabotage       = 0
 effect         =
     { "name", "value"
-      "Science_Bonus", 50
+      "Science_Bonus", 100
     }
 sound          = "w_copernicus_observatory"
 sound_alt      = "w_generic"
 ; /* xgettext:no-c-format */
 helptext       = _("\
-Boosts science production by 50% in the city where it is built.\
+Boosts science production by 100% in the city where it is built.\
 ")
 
 [building_cure_for_cancer]
@@ -1681,14 +1680,15 @@
 upkeep         = 0
 sabotage       = 0
 effect         =
-    { "name", "value"
-      "Science_Bonus", 100
+    { "name", "value", "req_type", "req"
+      "Science_Bonus", 100, "Building", "University"
     }
 sound          = "w_isaac_newtons_college"
 sound_alt      = "w_generic"
 ; /* xgettext:no-c-format */
 helptext       = _("\
-Boosts science production by 100% in the city where it is built.\
+Boosts science production by 100% in every city you control that\
+ has a University.\
 ")
 
 [building_js_bachs_cathedral]
@@ -1979,14 +1979,13 @@
 upkeep         = 0
 sabotage       = 0
 effect         =
-    { "name", "range", "value", "equiv", "req_type", "req"
-      "Science_Bonus", "Player", 50, "Labs", "Building", "Library"
+    { "name", "range", "value", "req_type", "req"
+      "Science_Bonus", "Player", 100, "Building" "Research Lab"
     }
 sound          = "w_seti_program"
 sound_alt      = "w_generic"
 helptext       = _("\
-Boosts science production in each city with a Library by 50%. \
- (Counts as having a Research Lab in all of your cities.)\
+Boosts science production in each city with a Research Lab by 100%. \
 ")
 
 [building_shakespeares_theatre]
Index: data/default/terrain.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/default/terrain.ruleset,v
retrieving revision 1.33
diff -u -r1.33 terrain.ruleset
--- data/default/terrain.ruleset        14 Sep 2004 00:01:35 -0000      1.33
+++ data/default/terrain.ruleset        20 Sep 2004 13:56:43 -0000
@@ -525,7 +525,7 @@
 graphic_special_2a   = "-"
 food_special_2       = 2
 shield_special_2     = 2
-trade_special_2      = 3
+trade_special_2      = 2
 road_trade_incr      = 0
 road_time            = 0
 irrigation_result    = "no"
Index: data/default/governments.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/default/governments.ruleset,v
retrieving revision 1.24
diff -u -r1.24 governments.ruleset
--- data/default/governments.ruleset    20 Aug 2004 20:13:18 -0000      1.24
+++ data/default/governments.ruleset    20 Sep 2004 13:56:43 -0000
@@ -447,7 +447,7 @@
 waste_extra_distance       = 0
 waste_max_distance_cap     = 36
 
-production_trade_bonus    = 1, 1
+production_trade_bonus    = 0, 1
 production_shield_bonus   = 0, 0
 production_food_bonus     = 0, 0
 
@@ -532,7 +532,7 @@
 waste_extra_distance       = 0
 waste_max_distance_cap     = 36
 
-production_trade_bonus    = 1, 1
+production_trade_bonus    = 0, 1
 production_shield_bonus   = 0, 0
 production_food_bonus     = 0, 0
 
Index: common/game.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/game.h,v
retrieving revision 1.152
diff -u -r1.152 game.h
--- common/game.h       16 Sep 2004 04:38:24 -0000      1.152
+++ common/game.h       20 Sep 2004 13:56:43 -0000
@@ -328,7 +328,7 @@
 #define GAME_MIN_AIFILL              0
 #define GAME_MAX_AIFILL              GAME_MAX_MAX_PLAYERS
 
-#define GAME_DEFAULT_RESEARCHCOST         10
+#define GAME_DEFAULT_RESEARCHCOST         20
 #define GAME_MIN_RESEARCHCOST         4
 #define GAME_MAX_RESEARCHCOST        100