Author: sveinung
Date: Wed Jun 8 16:33:46 2016
New Revision: 32797
URL: http://svn.gna.org/viewcvs/freeciv?rev=32797&view=rev
Log:
Paradrop source tile rules depend on the ruleset.
The auto generated help claims that a unit able to paradrop can do so from
"a friendly city or suitable base." The rules for where a unit can paradrop
from have become ruleset dependent. A ruleset may allow "Paradrop Unit" from
mountains but forbid it from all bases and cities.
Move the documentation about "Paradrop Unit" source tile legality to the
ruleset.
See bug #24729
Modified:
trunk/client/helpdata.c
trunk/data/alien/units.ruleset
trunk/data/civ2/units.ruleset
trunk/data/civ2civ3/units.ruleset
trunk/data/classic/units.ruleset
trunk/data/experimental/units.ruleset
trunk/data/multiplayer/units.ruleset
trunk/data/sandbox/units.ruleset
trunk/server/rscompat.c
Modified: trunk/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/helpdata.c?rev=32797&r1=32796&r2=32797&view=diff
==============================================================================
--- trunk/client/helpdata.c (original)
+++ trunk/client/helpdata.c Wed Jun 8 16:33:46 2016
@@ -4420,8 +4420,7 @@
break;
case ACTION_PARADROP:
cat_snprintf(buf, bufsz,
- _("* Can do the action \'%s\' from a friendly city "
- "or suitable base (range: %d tiles).\n"),
+ _("* Can do the action \'%s\' (range: %d tiles).\n"),
action_get_ui_name(act), utype->paratroopers_range);
break;
default:
Modified: trunk/data/alien/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/units.ruleset?rev=32797&r1=32796&r2=32797&view=diff
==============================================================================
--- trunk/data/alien/units.ruleset (original)
+++ trunk/data/alien/units.ruleset Wed Jun 8 16:33:46 2016
@@ -32,7 +32,7 @@
_("Cities")
_("AddToCity")
_("Infra"), _("Can build infrastructure.")
- _("Paratroopers")
+ _("Paratroopers"), _("Can be paradropped from a friendly city or suitable
base.")
}
; Names for custom unit class flags. There can be up to 8 of these.
Modified: trunk/data/civ2/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/units.ruleset?rev=32797&r1=32796&r2=32797&view=diff
==============================================================================
--- trunk/data/civ2/units.ruleset (original)
+++ trunk/data/civ2/units.ruleset Wed Jun 8 16:33:46 2016
@@ -33,7 +33,7 @@
_("AddToCity")
_("Nuclear")
_("Infra"), _("Can build infrastructure.")
- _("Paratroopers")
+ _("Paratroopers"), _("Can be paradropped from a friendly city or suitable
base.")
}
; Names for custom unit class flags. There can be up to 8 of these.
Modified: trunk/data/civ2civ3/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/units.ruleset?rev=32797&r1=32796&r2=32797&view=diff
==============================================================================
--- trunk/data/civ2civ3/units.ruleset (original)
+++ trunk/data/civ2civ3/units.ruleset Wed Jun 8 16:33:46 2016
@@ -41,7 +41,7 @@
_("AddToCity")
_("Nuclear")
_("Infra"), _("Can build infrastructure.")
- _("Paratroopers")
+ _("Paratroopers"), _("Can be paradropped from a friendly city or suitable
base.")
}
; Names for custom unit class flags. There can be up to 8 of these.
Modified: trunk/data/classic/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/units.ruleset?rev=32797&r1=32796&r2=32797&view=diff
==============================================================================
--- trunk/data/classic/units.ruleset (original)
+++ trunk/data/classic/units.ruleset Wed Jun 8 16:33:46 2016
@@ -39,7 +39,7 @@
_("AddToCity")
_("Nuclear")
_("Infra"), _("Can build infrastructure.")
- _("Paratroopers")
+ _("Paratroopers"), _("Can be paradropped from a friendly city or suitable
base.")
}
; Names for custom unit class flags. There can be up to 8 of these.
Modified: trunk/data/experimental/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/units.ruleset?rev=32797&r1=32796&r2=32797&view=diff
==============================================================================
--- trunk/data/experimental/units.ruleset (original)
+++ trunk/data/experimental/units.ruleset Wed Jun 8 16:33:46 2016
@@ -42,7 +42,7 @@
_("AddToCity")
_("Nuclear")
_("Infra"), _("Can build infrastructure.")
- _("Paratroopers")
+ _("Paratroopers"), _("Can be paradropped from a friendly city or suitable
base.")
}
; Names for custom unit class flags. There can be up to 8 of these.
Modified: trunk/data/multiplayer/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/units.ruleset?rev=32797&r1=32796&r2=32797&view=diff
==============================================================================
--- trunk/data/multiplayer/units.ruleset (original)
+++ trunk/data/multiplayer/units.ruleset Wed Jun 8 16:33:46 2016
@@ -38,7 +38,7 @@
_("AddToCity")
_("Nuclear")
_("Infra"), _("Can build infrastructure.")
- _("Paratroopers")
+ _("Paratroopers"), _("Can be paradropped from a friendly city or suitable
base.")
}
; Names for custom unit class flags. There can be up to 8 of these.
Modified: trunk/data/sandbox/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/units.ruleset?rev=32797&r1=32796&r2=32797&view=diff
==============================================================================
--- trunk/data/sandbox/units.ruleset (original)
+++ trunk/data/sandbox/units.ruleset Wed Jun 8 16:33:46 2016
@@ -42,7 +42,7 @@
_("AddToCity")
_("Nuclear")
_("Infra"), _("Can build infrastructure.")
- _("Paratroopers")
+ _("Paratroopers"), _("Can be paradropped from a friendly city or suitable
base.")
}
; Names for custom unit class flags. There can be up to 8 of these.
Modified: trunk/server/rscompat.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/rscompat.c?rev=32797&r1=32796&r2=32797&view=diff
==============================================================================
--- trunk/server/rscompat.c (original)
+++ trunk/server/rscompat.c Wed Jun 8 16:33:46 2016
@@ -182,7 +182,8 @@
{ N_("Bombarder"), N_("Can do bombard attacks.") },
{ N_("Nuclear"), N_("This unit's attack causes a nuclear explosion!") },
{ N_("Infra"), N_("Can build infrastructure.") },
- { N_("Paratroopers"), N_("Can paradrop.") }
+ { N_("Paratroopers"),
+ N_("Can be paradropped from a friendly city or suitable base.") }
};
/* Some unit class flags moved to the ruleset between 2.6 and 3.0.
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
