Author: jtn
Date: Tue Aug 5 22:44:47 2014
New Revision: 25831
URL: http://svn.gna.org/viewcvs/freeciv?rev=25831&view=rev
Log:
Rearrange civ2civ3 Solar Plant / Hoover Dam effect exclusions, so that
Hoover Dam in a city is considered to make a Solar Plant redundant.
No effect on bonuses.
See gna bug #22434.
Modified:
trunk/data/civ2civ3/effects.ruleset
Modified: trunk/data/civ2civ3/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/effects.ruleset?rev=25831&r1=25830&r2=25831&view=diff
==============================================================================
--- trunk/data/civ2civ3/effects.ruleset (original)
+++ trunk/data/civ2civ3/effects.ruleset Tue Aug 5 22:44:47 2014
@@ -2103,8 +2103,8 @@
"Building", "Factory", "City", TRUE
"Building", "Hydro Plant", "City", TRUE
"OutputType", "Shield", "Local", TRUE
+ "Building", "Solar Plant", "City", FALSE
"Building", "Hoover Dam", "City", FALSE
- "Building", "Solar Plant", "City", FALSE
}
[effect_hydro_plant_1]
@@ -2115,8 +2115,8 @@
"Building", "Mfg. Plant", "City", TRUE
"Building", "Hydro Plant", "City", TRUE
"OutputType", "Shield", "Local", TRUE
+ "Building", "Solar Plant", "City", FALSE
"Building", "Hoover Dam", "City", FALSE
- "Building", "Solar Plant", "City", FALSE
}
[effect_hydro_plant_2]
@@ -2125,8 +2125,8 @@
reqs =
{ "type", "name", "range", "present"
"Building", "Hydro Plant", "City", TRUE
+ "Building", "Solar Plant", "City", FALSE
"Building", "Hoover Dam", "City", FALSE
- "Building", "Solar Plant", "City", FALSE
}
[effect_hydro_plant_3]
@@ -2136,8 +2136,8 @@
{ "type", "name", "range", "present"
"Building", "Recycling Center", "City", TRUE
"Building", "Hydro Plant", "City", TRUE
+ "Building", "Solar Plant", "City", FALSE
"Building", "Hoover Dam", "City", FALSE
- "Building", "Solar Plant", "City", FALSE
}
[effect_hydro_plant_4]
@@ -2147,8 +2147,8 @@
{ "type", "name", "range", "present"
"Building", "Hoover Dam", "Player", TRUE
"Building", "Hydro Plant", "City", TRUE
+ "Building", "Solar Plant", "City", FALSE
"Building", "Hoover Dam", "City", FALSE
- "Building", "Solar Plant", "City", FALSE
}
[effect_library]
@@ -2212,8 +2212,8 @@
"Building", "Nuclear Plant", "City", TRUE
"OutputType", "Shield", "Local", TRUE
"Building", "Hydro Plant", "City", FALSE
+ "Building", "Solar Plant", "City", FALSE
"Building", "Hoover Dam", "City", FALSE
- "Building", "Solar Plant", "City", FALSE
}
[effect_nuclear_plant_1]
@@ -2225,8 +2225,8 @@
"Building", "Nuclear Plant", "City", TRUE
"OutputType", "Shield", "Local", TRUE
"Building", "Hydro Plant", "City", FALSE
+ "Building", "Solar Plant", "City", FALSE
"Building", "Hoover Dam", "City", FALSE
- "Building", "Solar Plant", "City", FALSE
}
[effect_nuclear_plant_2]
@@ -2236,8 +2236,8 @@
{ "type", "name", "range", "present"
"Building", "Nuclear Plant", "City", TRUE
"Building", "Hydro Plant", "City", FALSE
+ "Building", "Solar Plant", "City", FALSE
"Building", "Hoover Dam", "City", FALSE
- "Building", "Solar Plant", "City", FALSE
}
[effect_nuclear_plant_3]
@@ -2248,8 +2248,8 @@
"Building", "Recycling Center", "City", TRUE
"Building", "Nuclear Plant", "City", TRUE
"Building", "Hydro Plant", "City", FALSE
+ "Building", "Solar Plant", "City", FALSE
"Building", "Hoover Dam", "City", FALSE
- "Building", "Solar Plant", "City", FALSE
}
[effect_offshore_platform]
@@ -2417,10 +2417,10 @@
"Building", "Factory", "City", TRUE
"Building", "Power Plant", "City", TRUE
"OutputType", "Shield", "Local", TRUE
- "Building", "Hoover Dam", "City", FALSE
"Building", "Nuclear Plant", "City", FALSE
"Building", "Hydro Plant", "City", FALSE
"Building", "Solar Plant", "City", FALSE
+ "Building", "Hoover Dam", "City", FALSE
}
[effect_power_plant_1]
@@ -2431,10 +2431,10 @@
"Building", "Mfg. Plant", "City", TRUE
"Building", "Power Plant", "City", TRUE
"OutputType", "Shield", "Local", TRUE
- "Building", "Hoover Dam", "City", FALSE
"Building", "Nuclear Plant", "City", FALSE
"Building", "Hydro Plant", "City", FALSE
"Building", "Solar Plant", "City", FALSE
+ "Building", "Hoover Dam", "City", FALSE
}
[effect_recycling_center]
@@ -2443,10 +2443,10 @@
reqs =
{ "type", "name", "range", "present"
"Building", "Recycling Center", "City", TRUE
- "Building", "Hoover Dam", "City", FALSE
"Building", "Nuclear Plant", "City", FALSE
"Building", "Hydro Plant", "City", FALSE
"Building", "Solar Plant", "City", FALSE
+ "Building", "Hoover Dam", "City", FALSE
}
[effect_research_lab]
@@ -2513,37 +2513,41 @@
type = "Output_Bonus"
value = 25
reqs =
- { "type", "name", "range"
- "Building", "Factory", "City"
- "Building", "Solar Plant", "City"
- "OutputType", "Shield", "Local"
+ { "type", "name", "range", "present"
+ "Building", "Factory", "City", TRUE
+ "Building", "Solar Plant", "City", TRUE
+ "OutputType", "Shield", "Local", TRUE
+ "Building", "Hoover Dam", "City", FALSE
}
[effect_solar_plant_1]
type = "Output_Bonus"
value = 25
reqs =
- { "type", "name", "range"
- "Building", "Mfg. Plant", "City"
- "Building", "Solar Plant", "City"
- "OutputType", "Shield", "Local"
+ { "type", "name", "range", "present"
+ "Building", "Mfg. Plant", "City", TRUE
+ "Building", "Solar Plant", "City", TRUE
+ "OutputType", "Shield", "Local", TRUE
+ "Building", "Hoover Dam", "City", FALSE
}
[effect_solar_plant_2]
type = "Pollu_Prod_Pct"
value = -75
reqs =
- { "type", "name", "range"
- "Building", "Solar Plant", "City"
+ { "type", "name", "range", "present"
+ "Building", "Solar Plant", "City", TRUE
+ "Building", "Hoover Dam", "City", FALSE
}
[effect_solar_plant_3]
type = "Pollu_Prod_Pct"
value = -25
reqs =
- { "type", "name", "range"
- "Building", "Recycling Center", "City"
- "Building", "Solar Plant", "City"
+ { "type", "name", "range", "present"
+ "Building", "Recycling Center", "City", TRUE
+ "Building", "Solar Plant", "City", TRUE
+ "Building", "Hoover Dam", "City", FALSE
}
[effect_space_component]
@@ -2925,41 +2929,37 @@
type = "Output_Bonus"
value = 25
reqs =
- { "type", "name", "range", "present"
- "Building", "Factory", "City", TRUE
- "Building", "Hoover Dam", "City", TRUE
- "OutputType", "Shield", "Local", TRUE
- "Building", "Solar Plant", "City", FALSE
+ { "type", "name", "range"
+ "Building", "Factory", "City"
+ "Building", "Hoover Dam", "City"
+ "OutputType", "Shield", "Local"
}
[effect_hoover_dam_1]
type = "Output_Bonus"
value = 25
reqs =
- { "type", "name", "range", "present"
- "Building", "Mfg. Plant", "City", TRUE
- "Building", "Hoover Dam", "City", TRUE
- "OutputType", "Shield", "Local", TRUE
- "Building", "Solar Plant", "City", FALSE
+ { "type", "name", "range"
+ "Building", "Mfg. Plant", "City"
+ "Building", "Hoover Dam", "City"
+ "OutputType", "Shield", "Local"
}
[effect_hoover_dam_2]
type = "Pollu_Prod_Pct"
value = -75
reqs =
- { "type", "name", "range", "present"
- "Building", "Hoover Dam", "City", TRUE
- "Building", "Solar Plant", "City", FALSE
+ { "type", "name", "range"
+ "Building", "Hoover Dam", "City"
}
[effect_hoover_dam_3]
type = "Pollu_Prod_Pct"
value = -25
reqs =
- { "type", "name", "range", "present"
- "Building", "Recycling Center", "City", TRUE
- "Building", "Hoover Dam", "City", TRUE
- "Building", "Solar Plant", "City", FALSE
+ { "type", "name", "range"
+ "Building", "Recycling Center", "City"
+ "Building", "Hoover Dam", "City"
}
[effect_isaac_newtons_college]
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
