[Freeciv-Dev] Re: (PR#10125) Pollu_Prod_Pct

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

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

The bug is in README.effects.  This patch fixes it.

Nuclear and hydro plant reduce pollution by 50%.  Recycling center 
reduces it by 66%.  However the way this is done these two are not 
cumulative.  So if you have both of them you'll only get a 66% 
reduction.  I'm not sure if this is desired, but it's perfectly legal. 
It should however be explained in the helptext.

jason

? drawn_sprites.diff
? ftwl.diff
? settler_recursion_crash
? client/tilespec.diff
Index: data/default/buildings.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/default/buildings.ruleset,v
retrieving revision 1.52
diff -u -r1.52 buildings.ruleset
--- data/default/buildings.ruleset      13 Sep 2004 15:54:53 -0000      1.52
+++ data/default/buildings.ruleset      15 Sep 2004 15:36:03 -0000
@@ -594,7 +594,7 @@
 sound_alt      = "b_generic"
 helptext       = _("\
 Reduces the amount of pollution generated by production in a city\
- by 50%.  It also\
+ by 50% unless a recycling center is present.  It also\
  increases the shield production of a Factory or Mfg. Plant in the\
  city: a Factory and a Hydro Plant together give a 75% production\
  bonus, and a Factory, Mfg. Plant and Hydro Plant together give\
@@ -747,7 +747,7 @@
 sound_alt      = "b_generic"
 helptext       = _("\
 Reduces the amount of pollution generated by production in a city\
- by 50%.  It also\
+ by 50% unless a recycling center is available.  It also\
  increases the shield production of a Factory or Mfg. Plant in\
  the city: a Factory and a Nuclear Plant together give a 75%\
  production bonus, and a Factory, Mfg. Plant and Nuclear Plant\
Index: doc/README.effects
===================================================================
RCS file: /home/freeciv/CVS/freeciv/doc/README.effects,v
retrieving revision 1.3
diff -u -r1.3 README.effects
--- doc/README.effects  13 Sep 2004 15:54:53 -0000      1.3
+++ doc/README.effects  15 Sep 2004 15:36:04 -0000
@@ -70,9 +70,8 @@
 
 "Pollu_Pop_Pct"        - decreases pollution caused by population by AMOUNT 
percent
 
-"Pollu_Prod_Pct"- multiplies pollution caused by shield production by
-                 AMOUNT percent (applied after Pollu_Prod_Adj;
-                 multiple effects are multiplicative)
+"Pollu_Prod_Pct"- divides pollution caused by shield production by a
+                  factor of AMOUNT
 
 "Prod_Add_Tile"        - each worked tile produces AMOUNT additional shield
                  production