Author: jtn
Date: Fri Dec 18 21:13:08 2015
New Revision: 31081

URL: http://svn.gna.org/viewcvs/freeciv?rev=31081&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_6/data/civ2civ3/units.ruleset
    branches/S2_6/data/classic/units.ruleset
    branches/S2_6/data/experimental/units.ruleset
    branches/S2_6/data/multiplayer/units.ruleset
    branches/S2_6/data/sandbox/units.ruleset

Modified: branches/S2_6/data/civ2civ3/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/units.ruleset?rev=31081&r1=31080&r2=31081&view=diff
==============================================================================
--- branches/S2_6/data/civ2civ3/units.ruleset   (original)
+++ branches/S2_6/data/civ2civ3/units.ruleset   Fri Dec 18 21:13:08 2015
@@ -2222,9 +2222,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_6/data/classic/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/units.ruleset?rev=31081&r1=31080&r2=31081&view=diff
==============================================================================
--- branches/S2_6/data/classic/units.ruleset    (original)
+++ branches/S2_6/data/classic/units.ruleset    Fri Dec 18 21:13:08 2015
@@ -2017,9 +2017,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_6/data/experimental/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/experimental/units.ruleset?rev=31081&r1=31080&r2=31081&view=diff
==============================================================================
--- branches/S2_6/data/experimental/units.ruleset       (original)
+++ branches/S2_6/data/experimental/units.ruleset       Fri Dec 18 21:13:08 2015
@@ -2045,9 +2045,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_6/data/multiplayer/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/multiplayer/units.ruleset?rev=31081&r1=31080&r2=31081&view=diff
==============================================================================
--- branches/S2_6/data/multiplayer/units.ruleset        (original)
+++ branches/S2_6/data/multiplayer/units.ruleset        Fri Dec 18 21:13:08 2015
@@ -2114,9 +2114,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_6/data/sandbox/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/units.ruleset?rev=31081&r1=31080&r2=31081&view=diff
==============================================================================
--- branches/S2_6/data/sandbox/units.ruleset    (original)
+++ branches/S2_6/data/sandbox/units.ruleset    Fri Dec 18 21:13:08 2015
@@ -2222,9 +2222,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

Reply via email to