Author: sveinung
Date: Tue Aug  4 13:27:46 2015
New Revision: 29320

URL: http://svn.gna.org/viewcvs/freeciv?rev=29320&view=rev
Log:
Document that Join City needs population to add

Changed from sanity check to documentation after Marko Lindqvist <cazfi>
pointed out that a ruleset author may wish to define an action enabler
without a unit type requirement that applies to all otherwise eligible unit
types.

See patch #6157

Modified:
    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
    trunk/data/stub/units.ruleset
    trunk/doc/README.actions

Modified: trunk/data/alien/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/units.ruleset?rev=29320&r1=29319&r2=29320&view=diff
==============================================================================
--- trunk/data/alien/units.ruleset      (original)
+++ trunk/data/alien/units.ruleset      Tue Aug  4 13:27:46 2015
@@ -319,6 +319,8 @@
 ; Following actions require extra fields:
 ;  "Bombard"
 ;   bombard_rate = the number of shots fired at enemy units when attacking
+;  "Join City"
+;   pop_cost = the number of population added to the target city
 ;
 ; ** Roles **
 ;

Modified: trunk/data/civ2civ3/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/units.ruleset?rev=29320&r1=29319&r2=29320&view=diff
==============================================================================
--- trunk/data/civ2civ3/units.ruleset   (original)
+++ trunk/data/civ2civ3/units.ruleset   Tue Aug  4 13:27:46 2015
@@ -360,6 +360,8 @@
 ; Following actions require extra fields:
 ;  "Bombard"
 ;   bombard_rate = the number of shots fired at enemy units when attacking
+;  "Join City"
+;   pop_cost = the number of population added to the target city
 ;
 ; ** Roles **
 ;

Modified: trunk/data/classic/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/units.ruleset?rev=29320&r1=29319&r2=29320&view=diff
==============================================================================
--- trunk/data/classic/units.ruleset    (original)
+++ trunk/data/classic/units.ruleset    Tue Aug  4 13:27:46 2015
@@ -334,6 +334,8 @@
 ; Following actions require extra fields:
 ;  "Bombard"
 ;   bombard_rate = the number of shots fired at enemy units when attacking
+;  "Join City"
+;   pop_cost = the number of population added to the target city
 ;
 ; ** Roles **
 ;

Modified: trunk/data/experimental/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/units.ruleset?rev=29320&r1=29319&r2=29320&view=diff
==============================================================================
--- trunk/data/experimental/units.ruleset       (original)
+++ trunk/data/experimental/units.ruleset       Tue Aug  4 13:27:46 2015
@@ -348,6 +348,8 @@
 ; Following actions require extra fields:
 ;  "Bombard"
 ;   bombard_rate = the number of shots fired at enemy units when attacking
+;  "Join City"
+;   pop_cost = the number of population added to the target city
 ;
 ; ** Roles **
 ;

Modified: trunk/data/multiplayer/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/units.ruleset?rev=29320&r1=29319&r2=29320&view=diff
==============================================================================
--- trunk/data/multiplayer/units.ruleset        (original)
+++ trunk/data/multiplayer/units.ruleset        Tue Aug  4 13:27:46 2015
@@ -333,6 +333,8 @@
 ; Following actions require extra fields:
 ;  "Bombard"
 ;   bombard_rate = the number of shots fired at enemy units when attacking
+;  "Join City"
+;   pop_cost = the number of population added to the target city
 ;
 ; ** Roles **
 ;

Modified: trunk/data/stub/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/stub/units.ruleset?rev=29320&r1=29319&r2=29320&view=diff
==============================================================================
--- trunk/data/stub/units.ruleset       (original)
+++ trunk/data/stub/units.ruleset       Tue Aug  4 13:27:46 2015
@@ -251,6 +251,8 @@
 ; Following actions require extra fields:
 ;  "Bombard"
 ;   bombard_rate = the number of shots fired at enemy units when attacking
+;  "Join City"
+;   pop_cost = the number of population added to the target city
 ;
 ; ** Roles **
 ;

Modified: trunk/doc/README.actions
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.actions?rev=29320&r1=29319&r2=29320&view=diff
==============================================================================
--- trunk/doc/README.actions    (original)
+++ trunk/doc/README.actions    Tue Aug  4 13:27:46 2015
@@ -210,6 +210,7 @@
 
 "Join City" - Add the actor to the target city's population.
  * UI name can be set using ui_name_join_city
+ * actor must have population to add (set in pop_cost)
  * actor must be on the same tile as the target.
  * target city population must not become higher that the add_to_size_limit
    setting permits.


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to