Author: jtn Date: Wed Jan 20 01:22:45 2016 New Revision: 31499 URL: http://svn.gna.org/viewcvs/freeciv?rev=31499&view=rev Log: Document in Diplomat help that they will always lose if they go up against a Leader.
See gna bug #23757. Modified: 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/civ2civ3/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/units.ruleset?rev=31499&r1=31498&r2=31499&view=diff ============================================================================== --- branches/S2_5/data/civ2civ3/units.ruleset (original) +++ branches/S2_5/data/civ2civ3/units.ruleset Wed Jan 20 01:22:45 2016 @@ -2196,9 +2196,10 @@ Diplomats can also perform a number of actions in another player's\ city, although each Diplomat may attempt only one action. Most of\ these actions have a chance of failure. Also, any enemy Diplomats or\ - Spies in the city will oppose hostile actions; in this case, either\ - your unit or the defending unit will die. If the defending unit dies,\ - you lose one movement point and may try again.\ + Spies in the city will oppose hostile actions, as will the enemy Leader\ + in games with leaders; in this case, either your unit or the defending\ + unit will die (if you go up against the Leader you will always die). If\ + the defending unit dies, you lose one movement point and may try again.\ "), _("\ The actions available to Diplomats in a city are:\ "), _("\ Modified: branches/S2_5/data/classic/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/classic/units.ruleset?rev=31499&r1=31498&r2=31499&view=diff ============================================================================== --- branches/S2_5/data/classic/units.ruleset (original) +++ branches/S2_5/data/classic/units.ruleset Wed Jan 20 01:22:45 2016 @@ -2007,9 +2007,10 @@ Diplomats can also perform a number of actions in another player's\ city, although each Diplomat may attempt only one action. Most of\ these actions have a chance of failure. Also, any enemy Diplomats or\ - Spies in the city will oppose hostile actions; in this case, either\ - your unit or the defending unit will die. If the defending unit dies,\ - you lose one movement point and may try again.\ + Spies in the city will oppose hostile actions, as will the enemy Leader\ + in games with leaders; in this case, either your unit or the defending\ + unit will die (if you go up against the Leader you will always die). If\ + the defending unit dies, you lose one movement point and may try again.\ "), _("\ The actions available to Diplomats in a city are:\ "), _("\ Modified: branches/S2_5/data/experimental/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/experimental/units.ruleset?rev=31499&r1=31498&r2=31499&view=diff ============================================================================== --- branches/S2_5/data/experimental/units.ruleset (original) +++ branches/S2_5/data/experimental/units.ruleset Wed Jan 20 01:22:45 2016 @@ -2033,9 +2033,10 @@ Diplomats can also perform a number of actions in another player's\ city, although each Diplomat may attempt only one action. Most of\ these actions have a chance of failure. Also, any enemy Diplomats or\ - Spies in the city will oppose hostile actions; in this case, either\ - your unit or the defending unit will die. If the defending unit dies,\ - you lose one movement point and may try again.\ + Spies in the city will oppose hostile actions, as will the enemy Leader\ + in games with leaders; in this case, either your unit or the defending\ + unit will die (if you go up against the Leader you will always die). If\ + the defending unit dies, you lose one movement point and may try again.\ "), _("\ The actions available to Diplomats in a city are:\ "), _("\ Modified: branches/S2_5/data/multiplayer/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/multiplayer/units.ruleset?rev=31499&r1=31498&r2=31499&view=diff ============================================================================== --- branches/S2_5/data/multiplayer/units.ruleset (original) +++ branches/S2_5/data/multiplayer/units.ruleset Wed Jan 20 01:22:45 2016 @@ -2105,9 +2105,10 @@ Diplomats can also perform a number of actions in another player's\ city, although each Diplomat may attempt only one action. Most of\ these actions have a chance of failure. Also, any enemy Diplomats or\ - Spies in the city will oppose hostile actions; in this case, either\ - your unit or the defending unit will die. If the defending unit dies,\ - you lose one movement point and may try again.\ + Spies in the city will oppose hostile actions, as will the enemy Leader\ + in games with leaders; in this case, either your unit or the defending\ + unit will die (if you go up against the Leader you will always die). If\ + the defending unit dies, you lose one movement point and may try again.\ "), _("\ The actions available to Diplomats in a city are:\ "), _("\ _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits