Author: cazfi
Date: Thu Mar 13 23:54:41 2014
New Revision: 24662
URL: http://svn.gna.org/viewcvs/freeciv?rev=24662&view=rev
Log:
Use present = FALSE requirements instead of nreqs vector in alien ruleset
effects.ruleset.
See patch #4561
Modified:
trunk/data/alien/effects.ruleset
Modified: trunk/data/alien/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/effects.ruleset?rev=24662&r1=24661&r2=24662&view=diff
==============================================================================
--- trunk/data/alien/effects.ruleset (original)
+++ trunk/data/alien/effects.ruleset Thu Mar 13 23:54:41 2014
@@ -433,107 +433,83 @@
type = "Irrigation_Pct"
value = 100
reqs =
- { "type", "name", "range"
- "Extra", "Irrigation", "Local"
- }
-nreqs =
- { "type", "name", "range"
- "CityTile", "Center", "Local"
+ { "type", "name", "range", "present"
+ "Extra", "Irrigation", "Local", TRUE
+ "CityTile", "Center", "Local", FALSE
}
[effect_irrigation_2]
type = "Irrigation_Pct"
value = 100
reqs =
- { "type", "name", "range"
- "CityTile", "Center", "Local"
- "TerrainAlter", "CanIrrigate", "Local"
- }
-nreqs =
- { "type", "name", "range"
- "Extra", "Mine", "Local"
+ { "type", "name", "range", "present"
+ "CityTile", "Center", "Local", TRUE
+ "TerrainAlter", "CanIrrigate", "Local", TRUE
+ "Extra", "Mine", "Local", FALSE
}
[effect_farmland]
type = "Output_Per_Tile"
value = 50
reqs =
- { "type", "name", "range"
- "Extra", "Farmland", "Local"
- "OutputType", "Food", "Local"
- }
-nreqs =
- { "type", "name", "range"
- "CityTile", "Center", "Local"
+ { "type", "name", "range", "present"
+ "Extra", "Farmland", "Local", TRUE
+ "OutputType", "Food", "Local", TRUE
+ "CityTile", "Center", "Local", FALSE
}
[effect_farmland_regeneration]
type = "Output_Per_Tile"
value = 50
reqs =
- { "type", "name", "range"
- "Extra", "Farmland", "Local"
- "OutputType", "Food", "Local"
- "Tech", "Food Regeneration", "Player"
- }
-nreqs =
- { "type", "name", "range"
- "CityTile", "Center", "Local"
+ { "type", "name", "range", "present"
+ "Extra", "Farmland", "Local", TRUE
+ "OutputType", "Food", "Local", TRUE
+ "Tech", "Food Regeneration", "Player", TRUE
+ "CityTile", "Center", "Local", FALSE
}
[effect_citycenter]
type = "Output_Per_Tile"
value = 50
reqs =
- { "type", "name", "range"
- "CityTile", "Center", "Local"
- "TerrainAlter", "CanIrrigate", "Local"
- "Tech", "Protein Modifications", "Player"
- "OutputType", "Food", "Local"
- }
-nreqs =
- { "type", "name", "range"
- "Extra", "Mine", "Local"
+ { "type", "name", "range", "present"
+ "CityTile", "Center", "Local", TRUE
+ "TerrainAlter", "CanIrrigate", "Local", TRUE
+ "Tech", "Protein Modifications", "Player", TRUE
+ "OutputType", "Food", "Local", TRUE
+ "Extra", "Mine", "Local", FALSE
}
[effect_citycenter_regeneration]
type = "Output_Per_Tile"
value = 50
reqs =
- { "type", "name", "range"
- "CityTile", "Center", "Local"
- "TerrainAlter", "CanIrrigate", "Local"
- "Tech", "Protein Modifications", "Player"
- "OutputType", "Food", "Local"
- "Tech", "Food Regeneration", "Player"
- }
-nreqs =
- { "type", "name", "range"
- "Extra", "Mine", "Local"
+ { "type", "name", "range", "present"
+ "CityTile", "Center", "Local", TRUE
+ "TerrainAlter", "CanIrrigate", "Local", TRUE
+ "Tech", "Protein Modifications", "Player", TRUE
+ "OutputType", "Food", "Local", TRUE
+ "Tech", "Food Regeneration", "Player", TRUE
+ "Extra", "Mine", "Local", FALSE
}
[effect_pollution]
type = "Output_Tile_Punish_Pct"
value = 50
reqs =
- { "type", "name", "range"
- "Extra", "Pollution", "Local"
- }
-nreqs =
- { "type", "name", "range"
- "Extra", "Fallout", "Local"
+ { "type", "name", "range", "present"
+ "Extra", "Pollution", "Local", TRUE
+ "Extra", "Fallout", "Local", FALSE
}
[effect_fallout]
type = "Output_Tile_Punish_Pct"
value = 50
reqs =
- { "type", "name", "range"
- "Extra", "Fallout", "Local"
- }
-nreqs =
- { "type", "name", "range"
- "Extra", "Pollution", "Local"
+ { "type", "name", "range", "present"
+ "Extra", "Fallout", "Local", TRUE
+ "Extra", "Pollution", "Local", FALSE
}
[effect_pollution_fallout]
@@ -685,12 +661,9 @@
type = "Make_Content"
value = -2
reqs =
- { "type", "name", "range"
- "Tech", "Soul", "World"
- }
-nreqs =
- { "type", "name", "range"
- "Tech", "Soul", "Player"
+ { "type", "name", "range", "present"
+ "Tech", "Soul", "World", TRUE
+ "Tech", "Soul", "Player", FALSE
}
[effect_alien_rights]
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
