Author: jtn
Date: Sat Mar 14 17:49:31 2015
New Revision: 28533

URL: http://svn.gna.org/viewcvs/freeciv?rev=28533&view=rev
Log:
In help for terrain-altering units, rework handwritten text to remove
redundancy with autogenerated help.

Reported by Marko Lindqvist (cazfi@gna).

See gna patch #5858.

Modified:
    trunk/data/civ1/units.ruleset
    trunk/data/civ2/units.ruleset
    trunk/data/classic/units.ruleset
    trunk/data/experimental/units.ruleset
    trunk/data/multiplayer/units.ruleset

Modified: trunk/data/civ1/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/units.ruleset?rev=28533&r1=28532&r2=28533&view=diff
==============================================================================
--- trunk/data/civ1/units.ruleset       (original)
+++ trunk/data/civ1/units.ruleset       Sat Mar 14 17:49:31 2015
@@ -287,14 +287,14 @@
 Settlers are one of the key units in the game, as they are your main \
 means of founding new cities, and can also improve terrain.\
 "), _("\
-On terrain which supports it, they may build an irrigation system to \
+Building an irrigation system on a suitable tile causes it to \
 produce some extra food each turn. This requires a nearby source of \
 water: an ocean or river tile, or another tile with an \
 irrigation system, must share an edge (not just a corner) with the \
 target tile. Once irrigated, land remains so even if the water source \
 is removed.\
 "), _("\
-Settlers can build mines on some types of terrain, which increases the \
+Building a mine on suitable terrain increases the \
 number of production points produced by that tile. However, it is not \
 possible to have an irrigation system and a mine on the same tile.\
 "), _("\
@@ -303,8 +303,6 @@
 to another type; this is usually more expensive. For instance, Swamp \
 may be \"irrigated\" to yield Grassland. (Terrain conversion with \
 the \"irrigate\" order does not require a water source.)\
-"), _("\
-Settlers can also build roads, railroads, or fortresses.\
 "), _("\
 See the help on Terrain and Terrain Alterations for the effects of \
 these actions.\

Modified: trunk/data/civ2/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/units.ruleset?rev=28533&r1=28532&r2=28533&view=diff
==============================================================================
--- trunk/data/civ2/units.ruleset       (original)
+++ trunk/data/civ2/units.ruleset       Sat Mar 14 17:49:31 2015
@@ -290,7 +290,7 @@
 Settlers are one of the key units in the game, as they are your main \
 means of founding new cities, and can also improve terrain.\
 "), _("\
-On terrain which supports it, they may build an irrigation system to \
+Building an irrigation system on a suitable tile causes it to \
 produce some extra food each turn. This requires a nearby source of \
 water: an ocean or river tile, or another tile with an \
 irrigation system, must share an edge (not just a corner) with the \
@@ -299,7 +299,7 @@
 upgraded to Farmland by irrigating them a second time; this provides \
 more food to a city if it has a Supermarket.\
 "), _("\
-Settlers can build mines on some types of terrain, which increases the \
+Building a mine on suitable terrain increases the \
 number of production points produced by that tile. However, it is not \
 possible to have an irrigation system and a mine on the same tile.\
 "), _("\
@@ -308,8 +308,6 @@
 to another type; this is usually more expensive. For instance, Swamp \
 may be \"irrigated\" to yield Grassland. (Terrain conversion with \
 the \"irrigate\" order does not require a water source.)\
-"), _("\
-Settlers can also build roads, railroads, fortresses, or airbases.\
 "), _("\
 See the help on Terrain and Terrain Alterations for the effects of \
 these actions.\

Modified: trunk/data/classic/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/units.ruleset?rev=28533&r1=28532&r2=28533&view=diff
==============================================================================
--- trunk/data/classic/units.ruleset    (original)
+++ trunk/data/classic/units.ruleset    Sat Mar 14 17:49:31 2015
@@ -407,8 +407,8 @@
 Settlers are one of the key units in the game, as they are your main\
  means of founding new cities.\
 "), _("\
-Settlers can also perform the same terrain alterations as Workers,\
- except for building airbases or buoys.\
+Settlers can also perform some of the same terrain alterations as\
+ Workers.\
 "), _("\
 Upkeep for Settlers is in food as well as production, and a Settler\
  can die if its supporting city runs out of food. Settlers in a\
@@ -451,7 +451,7 @@
 helptext      = _("\
 Workers have the ability to improve terrain tiles.\
 "), _("\
-On terrain which supports it, they may build an irrigation system to \
+Building an irrigation system on a suitable tile causes it to \
 produce some extra food each turn. This requires a nearby source of \
 water: an ocean, lake, or river tile, or another tile with an \
 irrigation system, must share an edge (not just a corner) with the \
@@ -460,7 +460,7 @@
 upgraded to Farmland by irrigating them a second time; this provides \
 more food to a city if it has a Supermarket.\
 "), _("\
-Workers can build mines on some types of terrain, which increases the \
+Building a mine on suitable terrain increases the \
 number of production points produced by that tile. However, it is not \
 possible to have an irrigation system and a mine on the same tile.\
 "), _("\
@@ -470,8 +470,8 @@
 may be \"irrigated\" to yield Grassland. (Terrain conversion with \
 the \"irrigate\" order does not require a water source.)\
 "), _("\
-Workers can also build roads, railroads, fortresses, airbases, or \
-buoys (when on board a ship).\
+Workers can build airbases and buoys, which Settlers cannot. \
+Workers must be on board a ship to build buoys.\
 "), _("\
 See the help on Terrain and Terrain Alterations for the effects of \
 these actions.\

Modified: trunk/data/experimental/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/units.ruleset?rev=28533&r1=28532&r2=28533&view=diff
==============================================================================
--- trunk/data/experimental/units.ruleset       (original)
+++ trunk/data/experimental/units.ruleset       Sat Mar 14 17:49:31 2015
@@ -421,8 +421,8 @@
 Settlers are one of the key units in the game, as they are your main\
  means of founding new cities.\
 "), _("\
-Settlers can also perform the same terrain alterations as Workers,\
- except for building airbases or buoys.\
+Settlers can also perform some of the same terrain alterations as\
+ Workers.\
 "), _("\
 Upkeep for Settlers is in food as well as production, and a Settler\
  can die if its supporting city runs out of food. Settlers in a\
@@ -470,7 +470,7 @@
 helptext      = _("\
 Workers have the ability to improve terrain tiles.\
 "), _("\
-On terrain which supports it, they may build an irrigation system to \
+Building an irrigation system on a suitable tile causes it to \
 produce some extra food each turn. This requires a nearby source of \
 water: an ocean, lake, or river tile, or another tile with an \
 irrigation system, must share an edge (not just a corner) with the \
@@ -479,7 +479,7 @@
 upgraded to Farmland by irrigating them a second time; this provides \
 more food to a city if it has a Supermarket.\
 "), _("\
-Workers can build mines on some types of terrain, which increases the \
+Building a mine on suitable terrain increases the \
 number of production points produced by that tile. However, it is not \
 possible to have an irrigation system and a mine on the same tile.\
 "), _("\
@@ -489,8 +489,8 @@
 may be \"irrigated\" to yield Grassland. (Terrain conversion with \
 the \"irrigate\" order does not require a water source.)\
 "), _("\
-Workers can also build roads, railroads, maglev, fortresses, airbases, \
-or buoys (when on board a ship).\
+Workers can build airbases and buoys, which Settlers cannot. \
+Workers must be on board a ship to build buoys.\
 "), _("\
 See the help on Terrain and Terrain Alterations for the effects of \
 these actions.\

Modified: trunk/data/multiplayer/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/units.ruleset?rev=28533&r1=28532&r2=28533&view=diff
==============================================================================
--- trunk/data/multiplayer/units.ruleset        (original)
+++ trunk/data/multiplayer/units.ruleset        Sat Mar 14 17:49:31 2015
@@ -406,8 +406,8 @@
 Settlers are one of the key units in the game, as they are your main\
  means of founding new cities.\
 "), _("\
-Settlers can also perform the same terrain alterations as Workers,\
- except for building airbases.\
+Settlers can also perform some of the same terrain alterations as\
+ Workers.\
 "), _("\
 Upkeep for Settlers is in food as well as production, and a Settler\
  can die if its supporting city runs out of food. Settlers in a\
@@ -451,7 +451,7 @@
 helptext      = _("\
 Workers have the ability to improve terrain tiles.\
 "), _("\
-On terrain which supports it, they may build an irrigation system to \
+Building an irrigation system on a suitable tile causes it to \
 produce some extra food each turn. This requires a nearby source of \
 water: an ocean, lake, or river tile, or another tile with an \
 irrigation system, must share an edge (not just a corner) with the \
@@ -460,7 +460,7 @@
 upgraded to Farmland by irrigating them a second time; this provides \
 more food to a city if it has a Supermarket.\
 "), _("\
-Workers can build mines on some types of terrain, which increases the \
+Building a mine on suitable terrain increases the \
 number of production points produced by that tile. However, it is not \
 possible to have an irrigation system and a mine on the same tile.\
 "), _("\
@@ -470,7 +470,7 @@
 may be \"irrigated\" to yield Grassland. (Terrain conversion with \
 the \"irrigate\" order does not require a water source.)\
 "), _("\
-Workers can also build roads, railroads, fortresses, or airbases.\
+Workers can build airbases, which Settlers cannot.\
 "), _("\
 See the help on Terrain and Terrain Alterations for the effects of \
 these actions.\


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

Reply via email to