Author: jtn
Date: Mon Jun 16 23:57:16 2014
New Revision: 25160
URL: http://svn.gna.org/viewcvs/freeciv?rev=25160&view=rev
Log:
Correct IgTer help and ruleset comments.
Ruleset comments requested by Marko Lindqvist (cazfi@gna).
See gna bug #22195.
Modified:
trunk/client/helpdata.c
trunk/data/alien/units.ruleset
trunk/data/civ2civ3/units.ruleset
trunk/data/classic/units.ruleset
trunk/data/experimental/units.ruleset
trunk/data/multiplayer/units.ruleset
Modified: trunk/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/helpdata.c?rev=25160&r1=25159&r2=25160&view=diff
==============================================================================
--- trunk/client/helpdata.c (original)
+++ trunk/client/helpdata.c Mon Jun 16 23:57:16 2014
@@ -3141,8 +3141,13 @@
utype->bombard_rate);
}
if (utype_has_flag(utype, UTYF_IGTER)) {
- CATLSTR(buf, bufsz,
- _("* Ignores terrain effects (treats all tiles as roads).\n"));
+ cat_snprintf(buf, bufsz,
+ /* TRANS: "MP" = movement points. %s may have a
+ * fractional part. */
+ _("* Ignores terrain effects (moving costs at most %s MP "
+ "per tile).\n"),
+ move_points_text(terrain_control.igter_cost,
+ NULL, NULL, FALSE));
}
if (utype_has_flag(utype, UTYF_IGZOC)) {
CATLSTR(buf, bufsz, _("* Ignores zones of control.\n"));
Modified: trunk/data/alien/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/units.ruleset?rev=25160&r1=25159&r2=25160&view=diff
==============================================================================
--- trunk/data/alien/units.ruleset (original)
+++ trunk/data/alien/units.ruleset Mon Jun 16 23:57:16 2014
@@ -257,8 +257,9 @@
; around it freely
; "NonMil" = a non-military unit: no attacks; no martial law; can enter
; peaceful borders; DoesntOccupyTile
-; "IgTer" = ignore terrain/road etc, use constant move cost defined in
-; igter_cost (terrain.ruleset)
+; "IgTer" = use constant move cost defined in igter_cost
(terrain.ruleset)
+; rather than terrain/road etc cost, unless terrain cost is
+; less
; "OneAttack" = can only make a single attack, regardless of movement points
; "IgWall" = ignore effect of city walls
; "FieldUnit" = cause unhappiness even when not being aggressive
Modified: trunk/data/civ2civ3/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/units.ruleset?rev=25160&r1=25159&r2=25160&view=diff
==============================================================================
--- trunk/data/civ2civ3/units.ruleset (original)
+++ trunk/data/civ2civ3/units.ruleset Mon Jun 16 23:57:16 2014
@@ -300,8 +300,9 @@
; around it freely
; "NonMil" = a non-military unit: no attacks; no martial law; can enter
; peaceful borders; DoesntOccupyTile
-; "IgTer" = ignore terrain/road etc, use constant move cost defined in
-; igter_cost (terrain.ruleset)
+; "IgTer" = use constant move cost defined in igter_cost
(terrain.ruleset)
+; rather than terrain/road etc cost, unless terrain cost is
+; less
; "OneAttack" = can only make a single attack, regardless of movement points
; "IgWall" = ignore effect of city walls
; "FieldUnit" = cause unhappiness even when not being aggressive
Modified: trunk/data/classic/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/units.ruleset?rev=25160&r1=25159&r2=25160&view=diff
==============================================================================
--- trunk/data/classic/units.ruleset (original)
+++ trunk/data/classic/units.ruleset Mon Jun 16 23:57:16 2014
@@ -277,8 +277,9 @@
; around it freely
; "NonMil" = a non-military unit: no attacks; no martial law; can enter
; peaceful borders; DoesntOccupyTile
-; "IgTer" = ignore terrain/road etc, use constant move cost defined in
-; igter_cost (terrain.ruleset)
+; "IgTer" = use constant move cost defined in igter_cost
(terrain.ruleset)
+; rather than terrain/road etc cost, unless terrain cost is
+; less
; "OneAttack" = can only make a single attack, regardless of movement points
; "IgWall" = ignore effect of city walls
; "FieldUnit" = cause unhappiness even when not being aggressive
Modified: trunk/data/experimental/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/units.ruleset?rev=25160&r1=25159&r2=25160&view=diff
==============================================================================
--- trunk/data/experimental/units.ruleset (original)
+++ trunk/data/experimental/units.ruleset Mon Jun 16 23:57:16 2014
@@ -291,8 +291,9 @@
; around it freely
; "NonMil" = a non-military unit: no attacks; no martial law; can enter
; peaceful borders; DoesntOccupyTile
-; "IgTer" = ignore terrain/road etc, use constant move cost defined in
-; igter_cost (terrain.ruleset)
+; "IgTer" = use constant move cost defined in igter_cost
(terrain.ruleset)
+; rather than terrain/road etc cost, unless terrain cost is
+; less
; "OneAttack" = can only make a single attack, regardless of movement points
; "IgWall" = ignore effect of city walls
; "FieldUnit" = cause unhappiness even when not being aggressive
Modified: trunk/data/multiplayer/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/units.ruleset?rev=25160&r1=25159&r2=25160&view=diff
==============================================================================
--- trunk/data/multiplayer/units.ruleset (original)
+++ trunk/data/multiplayer/units.ruleset Mon Jun 16 23:57:16 2014
@@ -277,8 +277,9 @@
; around it freely
; "NonMil" = a non-military unit: no attacks; no martial law; can enter
; peaceful borders; DoesntOccupyTile
-; "IgTer" = ignore terrain/road etc, use constant move cost defined in
-; igter_cost (terrain.ruleset)
+; "IgTer" = use constant move cost defined in igter_cost
(terrain.ruleset)
+; rather than terrain/road etc cost, unless terrain cost is
+; less
; "OneAttack" = can only make a single attack, regardless of movement points
; "IgWall" = ignore effect of city walls
; "FieldUnit" = cause unhappiness even when not being aggressive
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
