Author: jtn
Date: Mon Oct 3 12:02:23 2016
New Revision: 33971
URL: http://svn.gna.org/viewcvs/freeciv?rev=33971&view=rev
Log:
Prevent building civ2civ3 Harbour next to Lake, since it cannot improve Lakes.
Also clarify Offshore Platform help wrt Lake after patch #5915.
See bug #25070.
Modified:
branches/S2_6/data/civ2civ3/buildings.ruleset
branches/S2_6/data/civ2civ3/effects.ruleset
branches/S2_6/data/civ2civ3/terrain.ruleset
Modified: branches/S2_6/data/civ2civ3/buildings.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/buildings.ruleset?rev=33971&r1=33970&r2=33971&view=diff
==============================================================================
--- branches/S2_6/data/civ2civ3/buildings.ruleset (original)
+++ branches/S2_6/data/civ2civ3/buildings.ruleset Mon Oct 3 12:02:23 2016
@@ -500,7 +500,7 @@
reqs =
{ "type", "name", "range"
"Tech", "Seafaring", "Player"
- "TerrainClass", "Oceanic", "Adjacent"
+ "TerrainFlag", "Sea", "Adjacent"
}
graphic = "b.harbour"
graphic_alt = "-"
@@ -514,7 +514,8 @@
sound_alt = "b_generic"
helptext = _("\
Gives one extra food resource on all Ocean or Deep Ocean tiles (but \
-not Lakes). The city needs to be coastal to build this improvement.\
+not Lakes). The city needs to be coastal (next to one of these tiles) \
+to build this improvement.\
")
[building_hydro_plant]
@@ -725,9 +726,9 @@
sound = "b_offshore_platform"
sound_alt = "b_generic"
helptext = _("\
-Every Ocean tile worked by the city yields one extra shield resource, \
+Every Ocean or Lake tile worked by the city yields one extra shield resource, \
as well as any Deep Ocean tile containing an oil platform. The city needs \
-to be coastal to build this improvement.\
+to be next to a water tile to build this improvement.\
"), _("\
Offshore Platforms also increase the pollution caused by the population \
of the city.\
Modified: branches/S2_6/data/civ2civ3/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/effects.ruleset?rev=33971&r1=33970&r2=33971&view=diff
==============================================================================
--- branches/S2_6/data/civ2civ3/effects.ruleset (original)
+++ branches/S2_6/data/civ2civ3/effects.ruleset Mon Oct 3 12:02:23 2016
@@ -2198,10 +2198,9 @@
value = 1
reqs =
{ "type", "name", "range", "present"
- "TerrainClass", "Oceanic", "Local", TRUE
+ "TerrainFlag", "Sea", "Local", TRUE
"Building", "Harbour", "City", TRUE
"OutputType", "Food", "Local", TRUE
- "Terrain", "Lake", "Local", FALSE
}
[effect_hydro_plant]
Modified: branches/S2_6/data/civ2civ3/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/terrain.ruleset?rev=33971&r1=33970&r2=33971&view=diff
==============================================================================
--- branches/S2_6/data/civ2civ3/terrain.ruleset (original)
+++ branches/S2_6/data/civ2civ3/terrain.ruleset Mon Oct 3 12:02:23 2016
@@ -23,6 +23,7 @@
flags =
{ "name", "helptxt"
_("Oil"), _("Mine can be upgraded to Oil Well.")
+ _("Sea"), _("Allows cities to build Harbors.")
_("NoPollution"), _("No Pollution nor Fallout appear here.")
}
@@ -306,7 +307,7 @@
cooler_wetter_result = "Glacier"
cooler_drier_result = "no"
native_to = "Sea", "Air", "Missile", "Helicopter", "Trireme"
-flags = "NoCities", "UnsafeCoast", "NoZoc", "NoFortify"
+flags = "NoCities", "UnsafeCoast", "NoZoc", "NoFortify", "Sea"
property_ocean_depth = 32
color.r = 0
color.g = 46
@@ -350,7 +351,7 @@
cooler_wetter_result = "no"
cooler_drier_result = "no"
native_to = "Sea", "Air", "Missile", "Helicopter"
-flags = "NoCities", "NoPollution", "UnsafeCoast", "NoZoc",
"NoFortify"
+flags = "NoCities", "NoPollution", "UnsafeCoast", "NoZoc",
"NoFortify", "Sea"
property_ocean_depth = 87
color.r = 0
color.g = 33
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
