[Freeciv-Dev] Re: (PR#14436) use nodup for rulesets

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=14436 >

Jason Short wrote:
> <URL: http://bugs.freeciv.org/Ticket/Display.html?id=14436 >
> 
> This patch prevents duplicate entries in rulesets.
> 
> The patches are for the development version and 2.0.  There is a genuine 
> bug in the 2.0 civ1 ruleset; I'm not sure if my fix is correct.

I believe this is the correct S2_0 fix.  See

http://apolyton.net/civ1/gameplay/civ_wonders.txt

-jason

Index: server/ruleset.c
===================================================================
--- server/ruleset.c    (revision 11169)
+++ server/ruleset.c    (working copy)
@@ -156,7 +156,7 @@
 
   sz_strlcpy(sfilename, dfilename);
 
-  if (!section_file_load(file,sfilename)) {
+  if (!section_file_load_nodup(file, sfilename)) {
     freelog(LOG_FATAL,
            /* TRANS: message for an obscure ruleset error. */
            _("Could not load ruleset file \"%s\"."), sfilename);
Index: data/nation/phoenician.ruleset
===================================================================
--- data/nation/phoenician.ruleset      (revision 11169)
+++ data/nation/phoenician.ruleset      (working copy)
@@ -17,7 +17,6 @@
 expand=2
 civilized=2
 advisors=100,100,100,100,100,100,100
-init_techs=""
 
 tech_goals = "Alphabet", "Trade", "Seafaring", "Navigation"
 
Index: data/civ1/buildings.ruleset
===================================================================
--- data/civ1/buildings.ruleset (revision 11169)
+++ data/civ1/buildings.ruleset (working copy)
@@ -1258,18 +1258,15 @@
 sabotage       = 0
 effect         =
     { "name", "range", "value", "req_type", "req"
-      "Science_Bonus", "Player", 50, "Building", "Library"
-      "Science_Bonus", "Player", 50, "Building", "University"
+      "Science_Bonus", "Player", 33, "Building", "Library"
+      "Science_Bonus", "Player", 33, "Building", "University"
     }
-effect         =
-    { "type", "range", "amount"
-       "Science_Bonus", "City", 100
-    }
 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 33% in each city with a library, and 33% in\
+ each city with a university.\
 ")
 
 [building_js_bachs_cathedral]
Index: data/civ2/terrain.ruleset
===================================================================
--- data/civ2/terrain.ruleset   (revision 11169)
+++ data/civ2/terrain.ruleset   (working copy)
@@ -419,7 +419,6 @@
 cooler_wetter_result = "Desert"
 cooler_drier_result  = "Tundra"
 flags                = "CanHaveRiver"
-flags                = "CanHaveRiver"
 helptext            = _("\
 Jungles are densely overgrown, making agriculture somewhat\
  problematic.\