Author: jtn
Date: Tue Jun 17 00:00:09 2014
New Revision: 25167
URL: http://svn.gna.org/viewcvs/freeciv?rev=25167&view=rev
Log:
Correct IgTer help and ruleset comments.
Ruleset comments requested by Marko Lindqvist (cazfi@gna).
See gna bug #22195.
Modified:
branches/S2_5/client/helpdata.c
branches/S2_5/data/alien/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/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/helpdata.c?rev=25167&r1=25166&r2=25167&view=diff
==============================================================================
--- branches/S2_5/client/helpdata.c (original)
+++ branches/S2_5/client/helpdata.c Tue Jun 17 00:00:09 2014
@@ -2553,8 +2553,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: branches/S2_5/data/alien/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/alien/units.ruleset?rev=25167&r1=25166&r2=25167&view=diff
==============================================================================
--- branches/S2_5/data/alien/units.ruleset (original)
+++ branches/S2_5/data/alien/units.ruleset Tue Jun 17 00:00:09 2014
@@ -254,8 +254,9 @@
; "ZOC" flag
; "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: branches/S2_5/data/civ2civ3/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/units.ruleset?rev=25167&r1=25166&r2=25167&view=diff
==============================================================================
--- branches/S2_5/data/civ2civ3/units.ruleset (original)
+++ branches/S2_5/data/civ2civ3/units.ruleset Tue Jun 17 00:00:09 2014
@@ -296,8 +296,9 @@
; "ZOC" flag
; "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: branches/S2_5/data/classic/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/classic/units.ruleset?rev=25167&r1=25166&r2=25167&view=diff
==============================================================================
--- branches/S2_5/data/classic/units.ruleset (original)
+++ branches/S2_5/data/classic/units.ruleset Tue Jun 17 00:00:09 2014
@@ -273,8 +273,9 @@
; "ZOC" flag
; "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: branches/S2_5/data/experimental/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/experimental/units.ruleset?rev=25167&r1=25166&r2=25167&view=diff
==============================================================================
--- branches/S2_5/data/experimental/units.ruleset (original)
+++ branches/S2_5/data/experimental/units.ruleset Tue Jun 17 00:00:09 2014
@@ -287,8 +287,9 @@
; "ZOC" flag
; "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: branches/S2_5/data/multiplayer/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/multiplayer/units.ruleset?rev=25167&r1=25166&r2=25167&view=diff
==============================================================================
--- branches/S2_5/data/multiplayer/units.ruleset (original)
+++ branches/S2_5/data/multiplayer/units.ruleset Tue Jun 17 00:00:09 2014
@@ -273,8 +273,9 @@
; "ZOC" flag
; "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
