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

The Hoover Dam makes solar plants not eliminate pollution. A Recycle
Center makes solar plants not eliminate pollution.

A recycle center fixes the pollution bonus at 66%, regardless of other
improvements. The help text does not say that it doesn't stack, which I
take to mean that it *should* stack (as a percentage, so 83% total for
eg. Recycle + Hydro).

Hoover, Nuke, Hydro, and Solar pollution bonuses are half dependent on
having a Factory, and half dependent on having a Mfg. Plant. The help
text doesn't say the pollution bonuses are dependent on anything.


The following patch should fix these issues.


$ svn diff
Index: data/default/effects.ruleset
===================================================================
--- data/default/effects.ruleset        (revision 13104)
+++ data/default/effects.ruleset        (working copy)
@@ -1023,34 +1023,18 @@

[effect_hydro_plant_2]
name   = "Pollu_Prod_Pct"
-value  = -25
+value  = -50
reqs   =
     { "type", "name", "range"
-      "Building", "Factory", "City"
       "Building", "Hydro Plant", "City"
     }
nreqs  =
     { "type", "name", "range"
-      "Building", "Recycling Center", "City"
       "Building", "Hoover Dam", "Player"
       "Building", "Nuclear Plant", "City"
+      "Building", "Solar Plant", "City"
     }

-[effect_hydro_plant_3]
-name   = "Pollu_Prod_Pct"
-value  = -25
-reqs   =
-    { "type", "name", "range"
-      "Building", "Mfg. Plant", "City"
-      "Building", "Hydro Plant", "City"
-    }
-nreqs  =
-    { "type", "name", "range"
-      "Building", "Recycling Center", "City"
-      "Building", "Hoover Dam", "Player"
-      "Building", "Nuclear Plant", "City"
-    }
-
[effect_library]
name   = "Output_Bonus"
value  = 100
@@ -1126,32 +1110,17 @@

[effect_nuclear_plant_2]
name   = "Pollu_Prod_Pct"
-value  = -25
+value  = -50
reqs   =
     { "type", "name", "range"
-      "Building", "Factory", "City"
       "Building", "Nuclear Plant", "City"
     }
nreqs  =
     { "type", "name", "range"
-      "Building", "Recycling Center", "City"
       "Building", "Hoover Dam", "Player"
+      "Building", "Solar Plant", "City"
     }

-[effect_nuclear_plant_3]
-name   = "Pollu_Prod_Pct"
-value  = -25
-reqs   =
-    { "type", "name", "range"
-      "Building", "Mfg. Plant", "City"
-      "Building", "Nuclear Plant", "City"
-    }
-nreqs  =
-    { "type", "name", "range"
-      "Building", "Recycling Center", "City"
-      "Building", "Hoover Dam", "Player"
-    }
-
[effect_offshore_platform]
name   = "Output_Add_Tile"
value  = 1
@@ -1301,12 +1270,27 @@

[effect_recycling_center]
name   = "Pollu_Prod_Pct"
-value  = -66
+value  = -33
reqs   =
     { "type", "name", "range"
       "Building", "Recycling Center", "City"
     }

+[effect_recycling_center_1]
+name   = "Pollu_Prod_Pct"
+value  = -33
+reqs   =
+    { "type", "name", "range"
+      "Building", "Recycling Center", "City"
+    }
+nreqs  =
+    { "type", "name", "range"
+      "Building", "Hoover Dam", "Player"
+      "Building", "Nuclear Plant", "City"
+      "Building", "Hydro Plant", "City"
+      "Building", "Solar Plant", "City"
+    }
+
[effect_research_lab]
name   = "Output_Bonus"
value  = 100
@@ -1398,36 +1382,12 @@

[effect_solar_plant_2]
name   = "Pollu_Prod_Pct"
-value  = -50
+value  = -100
reqs   =
     { "type", "name", "range"
-      "Building", "Factory", "City"
       "Building", "Solar Plant", "City"
     }
-nreqs  =
-    { "type", "name", "range"
-      "Building", "Recycling Center", "City"
-      "Building", "Hoover Dam", "Player"
-      "Building", "Nuclear Plant", "City"
-      "Building", "Hydro Plant", "City"
-    }

-[effect_solar_plant_3]
-name   = "Pollu_Prod_Pct"
-value  = -50
-reqs   =
-    { "type", "name", "range"
-      "Building", "Mfg. Plant", "City"
-      "Building", "Solar Plant", "City"
-    }
-nreqs  =
-    { "type", "name", "range"
-      "Building", "Recycling Center", "City"
-      "Building", "Hoover Dam", "Player"
-      "Building", "Nuclear Plant", "City"
-      "Building", "Hydro Plant", "City"
-    }
-
[effect_space_component]
name   = "SS_Component"
value  = 1
@@ -1689,30 +1649,16 @@

[effect_hoover_dam_2]
name   = "Pollu_Prod_Pct"
-value  = -25
+value  = -50
reqs   =
     { "type", "name", "range"
-      "Building", "Factory", "City"
       "Building", "Hoover Dam", "Player"
     }
nreqs  =
     { "type", "name", "range"
-      "Building", "Recycling Center", "City"
+      "Building", "Solar Plant", "City"
     }

-[effect_hoover_dam_3]
-name   = "Pollu_Prod_Pct"
-value  = -25
-reqs   =
-    { "type", "name", "range"
-      "Building", "Mfg. Plant", "City"
-      "Building", "Hoover Dam", "Player"
-    }
-nreqs  =
-    { "type", "name", "range"
-      "Building", "Recycling Center", "City"
-    }
-
[effect_isaac_newtons_college]
name   = "Output_Bonus"
value  = 100




_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to