Author: cazfi
Date: Sat Dec 13 01:02:32 2014
New Revision: 27280

URL: http://svn.gna.org/viewcvs/freeciv?rev=27280&view=rev
Log:
Renamed civ2civ3 Trench as Fort and Airfield as Airstrip.

Requested by Jacob Nevins <jtn>

See patch #5524

Modified:
    trunk/data/civ2civ3/effects.ruleset
    trunk/data/civ2civ3/terrain.ruleset
    trunk/doc/README.ruleset_civ2civ3

Modified: trunk/data/civ2civ3/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/effects.ruleset?rev=27280&r1=27279&r2=27280&view=diff
==============================================================================
--- trunk/data/civ2civ3/effects.ruleset (original)
+++ trunk/data/civ2civ3/effects.ruleset Sat Dec 13 01:02:32 2014
@@ -256,12 +256,12 @@
       "UnitClass", "Missile", "Local", FALSE
     }
 
-[effect_trench_defense]
+[effect_fort_defense]
 type    = "Defend_Bonus"
 value   = 50
 reqs    =
     { "type", "name", "range", "present"
-      "Extra", "Trench", "Local", TRUE
+      "Extra", "Fort", "Local", TRUE
 ;      "UnitClass", "Land", "Local", FALSE
 ;      "UnitClass", "Small Land", "Local", FALSE
 ;      "UnitClass", "Big Land", "Local", FALSE
@@ -296,7 +296,7 @@
 value   = 10
 reqs    =
     { "type", "name", "range", "present"
-      "Extra", "Airfield", "Local", TRUE
+      "Extra", "Airstrip", "Local", TRUE
       "UnitClass", "Land", "Local", FALSE
       "UnitClass", "Small Land", "Local", FALSE
       "UnitClass", "Big Land", "Local", FALSE
@@ -330,7 +330,7 @@
 value   = 50
 reqs    =
     { "type", "name", "range", "present"
-      "Extra", "Airfield", "Local", TRUE
+      "Extra", "Airstrip", "Local", TRUE
       "UnitClass", "Land", "Local", FALSE
       "UnitClass", "Small Land", "Local", FALSE
       "UnitClass", "Big Land", "Local", FALSE

Modified: trunk/data/civ2civ3/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/terrain.ruleset?rev=27280&r1=27279&r2=27280&view=diff
==============================================================================
--- trunk/data/civ2civ3/terrain.ruleset (original)
+++ trunk/data/civ2civ3/terrain.ruleset Sat Dec 13 01:02:32 2014
@@ -1216,8 +1216,8 @@
 removal_time   = 0
 flags          = "NuclearWinter"
 
-[extra_trench]
-name           = _("Trench")
+[extra_fort]
+name           = _("Fort")
 category       = "Infra"
 causes         = "Base"
 rmcauses       = "Pillage"
@@ -1237,11 +1237,11 @@
 build_time     = 2
 removal_time   = 0
 native_to      = "Land", "Small Land", "Big Land"
-conflicts      = "Airfield", "Airbase"
+conflicts      = "Airstrip", "Airbase"
 flags          = "NativeTile"
 helptext       = _("\
-Trenches are fast-built fortifications providing some defense to land units. \
-The construction of fortresses can begin only after the underlaying trench \
+Forts are fast-built fortifications providing some defense to land units. \
+The construction of fortresses can begin only after the underlaying fort \
 is completed.\
 ")
 
@@ -1258,7 +1258,7 @@
 rmact_gfx_alt  = "-"
 reqs           =
     { "type", "name", "range", "present"
-      "Extra", "Trench", "Local", TRUE
+      "Extra", "Fort", "Local", TRUE
       "Tech", "Construction", "Player", TRUE
       "TerrainClass", "Land", "Local", TRUE
       "UnitFlag", "Settlers", "Local", TRUE
@@ -1267,7 +1267,7 @@
 build_time     = 2
 removal_time   = 0
 native_to      = "Land", "Small Land", "Big Land"
-conflicts      = "Airfield", "Airbase"
+conflicts      = "Airstrip", "Airbase"
 flags          = "NativeTile"
 helptext       = _("\
 Fortresses improve defense for land units. Among other effects, a land \
@@ -1275,8 +1275,8 @@
 a quarter of its hit points.\
 ")
 
-[extra_airfield]
-name           = _("Airfield")
+[extra_airstrip]
+name           = _("Airstrip")
 category       = "Infra"
 causes         = "Base"
 rmcauses       = "Pillage"
@@ -1296,13 +1296,13 @@
 build_time     = 2
 removal_time   = 0
 native_to      = "Air", "Helicopter", "Missile"
-conflicts      = "Trench", "Fortress"
+conflicts      = "Fort", "Fortress"
 flags          = "Refuel"
 helptext       = _("\
-Airfields are fast-built airbases to allow air units to land and refuel, \
+Airstrips are fast-built airbases to allow air units to land and refuel, \
 and improve the defense against enemy air units. \
-Air units in an airfield may be attacked by land units. \
-The construction of an airbase can begin only after the underlaying airfield \
+Air units in an airstrip may be attacked by land units. \
+The construction of an airbase can begin only after the underlaying airstrip \
 is completed.\
 ")
 
@@ -1319,7 +1319,7 @@
 rmact_gfx_alt  = "-"
 reqs           =
     { "type", "name", "range", "present"
-      "Extra", "Airfield", "Local", TRUE
+      "Extra", "Airstrip", "Local", TRUE
       "Tech", "Radio", "Player", TRUE
       "TerrainClass", "Land", "Local", TRUE
       "UnitFlag", "Airbase", "Local", TRUE
@@ -1328,7 +1328,7 @@
 build_time     = 2
 removal_time   = 0
 native_to      = "Air", "Helicopter", "Missile"
-conflicts      = "Trench", "Fortress"
+conflicts      = "Fort", "Fortress"
 flags          = "Refuel"
 helptext       = _("\
 Airbases allow your air units to land and refuel, and improve the defense \
@@ -1547,8 +1547,8 @@
 ;
 ; */ <-- avoid gettext warnings
 
-[base_trench]
-name           = _("Trench")
+[base_fort]
+name           = _("Fort")
 gui_type       = "Fortress"
 border_sq      = -1
 flags          = "DiplomatDefense"
@@ -1559,8 +1559,8 @@
 border_sq      = -1
 flags          = "NoAggressive", "NoStackDeath", "DiplomatDefense"
 
-[base_airfield]
-name           = _("Airfield")
+[base_airstrip]
+name           = _("Airstrip")
 gui_type       = "Airbase"
 border_sq      = -1
 flags          = "ParadropFrom"

Modified: trunk/doc/README.ruleset_civ2civ3
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.ruleset_civ2civ3?rev=27280&r1=27279&r2=27280&view=diff
==============================================================================
--- trunk/doc/README.ruleset_civ2civ3   (original)
+++ trunk/doc/README.ruleset_civ2civ3   Sat Dec 13 01:02:32 2014
@@ -34,7 +34,7 @@
 - A city can support as many Military units as its population size (min 4, max 
20). Additional units cause waste of Food. If the city shrinks due to 
starvation, one of those extra units will be disbanded.
 - Units lose one Veteran level when upgraded.
 - Unlimited movement on rails delayed to maglev (available with 
Superconductors). Movement bonus on Railroads x6, on Roads x3, on Rivers x3 
(non diagonal).
-- Added Trench and Airfield bases, required before you can build Fortress or 
Airbase, respectively. It prevents the construction of full bases in one single 
turn.
+- Added Fort and Airstrip bases, required before you can build Fortress or 
Airbase, respectively. It prevents the construction of full bases in one single 
turn.
 - Specialists output reduced to 2 (same as civ2). There are wonders that 
increase it to 3 for all players.
 - Enabled Tech Leakage: technologies are cheaper if already discovered by 
other nations you have Embassy with.
 - The cost of each Tech is equal to the number of steps needed to get the tech 
(Tech Cost = Base Cost * Number of Parents). It is a linear formula more 
similar to civ2, and it fits better the new reduced bonuses from Trade and 
Science.
@@ -454,7 +454,7 @@
 - Electricity allows Irrigation without adjacent water (as in civ3).
 - Removed effect that prevented extra output from cities where Irrigation and 
Mine were present at same time (no longer possible).
 - Reduced by one the gold upkeep of Aqueduct, Bank, Stock Exchange, Port 
Facility and SDI Defense.
-- Added Trench and Airfield bases, as pre-requisite for Fortress and Airbase, 
in order to prevent the construction of full bases in one single turn. Airbases 
and Fortresses can be built on river tiles again.
+- Added Fort and Airstrip bases, as pre-requisite for Fortress and Airbase, in 
order to prevent the construction of full bases in one single turn. Airbases 
and Fortresses can be built on river tiles again.
 - Introduced Maglev, available with Superconductors, that allows unlimited 
movement for Land units (except Big Land and Merchant classes).
 
 Terrain:


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

Reply via email to