Author: jtn
Date: Sat Mar 14 17:57:42 2015
New Revision: 28547
URL: http://svn.gna.org/viewcvs/freeciv?rev=28547&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:
branches/S2_5/data/civ1/units.ruleset
branches/S2_5/data/civ2/units.ruleset
branches/S2_5/data/civ2civ3/units.ruleset
branches/S2_5/data/classic/units.ruleset
branches/S2_5/data/experimental/units.ruleset
branches/S2_5/data/multiplayer/units.ruleset
Modified: branches/S2_5/data/civ1/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ1/units.ruleset?rev=28547&r1=28546&r2=28547&view=diff
==============================================================================
--- branches/S2_5/data/civ1/units.ruleset (original)
+++ branches/S2_5/data/civ1/units.ruleset Sat Mar 14 17:57:42 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: branches/S2_5/data/civ2/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2/units.ruleset?rev=28547&r1=28546&r2=28547&view=diff
==============================================================================
--- branches/S2_5/data/civ2/units.ruleset (original)
+++ branches/S2_5/data/civ2/units.ruleset Sat Mar 14 17:57:42 2015
@@ -291,7 +291,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 \
@@ -300,7 +300,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.\
"), _("\
@@ -309,8 +309,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: branches/S2_5/data/civ2civ3/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/units.ruleset?rev=28547&r1=28546&r2=28547&view=diff
==============================================================================
--- branches/S2_5/data/civ2civ3/units.ruleset (original)
+++ branches/S2_5/data/civ2civ3/units.ruleset Sat Mar 14 17:57:42 2015
@@ -434,8 +434,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.\
"), _("\
TIP: optimal production of Settlers occurs in cities of at most \
size 4, or cities with a Granary of at most size 6.\
@@ -476,8 +476,8 @@
roles = "Settlers"
helptext = _("\
Migrants can be used to transfer population to other cities, but \
-may not found new cities. They can also perform the same terrain \
-alterations as Settlers.\
+may not found new cities. They can also perform some of the same \
+terrain alterations as Workers.\
")
[unit_worker]
@@ -516,7 +516,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. Without knowledge of Electricity, \
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 \
@@ -527,7 +527,7 @@
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.\
"), _("\
@@ -537,8 +537,8 @@
may be \"irrigated\" to yield Plains. (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 and Migrants \
+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: branches/S2_5/data/classic/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/classic/units.ruleset?rev=28547&r1=28546&r2=28547&view=diff
==============================================================================
--- branches/S2_5/data/classic/units.ruleset (original)
+++ branches/S2_5/data/classic/units.ruleset Sat Mar 14 17:57:42 2015
@@ -411,8 +411,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\
@@ -455,7 +455,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 \
@@ -464,7 +464,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.\
"), _("\
@@ -474,8 +474,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: branches/S2_5/data/experimental/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/experimental/units.ruleset?rev=28547&r1=28546&r2=28547&view=diff
==============================================================================
--- branches/S2_5/data/experimental/units.ruleset (original)
+++ branches/S2_5/data/experimental/units.ruleset Sat Mar 14 17:57:42 2015
@@ -425,8 +425,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\
@@ -474,7 +474,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 \
@@ -483,7 +483,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.\
"), _("\
@@ -493,8 +493,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: branches/S2_5/data/multiplayer/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/multiplayer/units.ruleset?rev=28547&r1=28546&r2=28547&view=diff
==============================================================================
--- branches/S2_5/data/multiplayer/units.ruleset (original)
+++ branches/S2_5/data/multiplayer/units.ruleset Sat Mar 14 17:57:42 2015
@@ -411,8 +411,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\
@@ -456,7 +456,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 \
@@ -465,7 +465,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.\
"), _("\
@@ -475,7 +475,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
