Author: cazfi
Date: Thu May  5 08:16:57 2016
New Revision: 32586

URL: http://svn.gna.org/viewcvs/freeciv?rev=32586&view=rev
Log:
Added ruleset comments about "NoAggressive" base flag restriction that base
also needs to be near friendly city.

Reported by David Fernandez <bardo>

See patch #7184

Modified:
    trunk/common/city.c
    trunk/common/unit.c
    trunk/data/alien/terrain.ruleset
    trunk/data/civ1/terrain.ruleset
    trunk/data/civ2/terrain.ruleset
    trunk/data/civ2civ3/terrain.ruleset
    trunk/data/classic/terrain.ruleset
    trunk/data/experimental/terrain.ruleset
    trunk/data/multiplayer/terrain.ruleset
    trunk/data/sandbox/terrain.ruleset
    trunk/data/stub/terrain.ruleset

Modified: trunk/common/city.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/city.c?rev=32586&r1=32585&r2=32586&view=diff
==============================================================================
--- trunk/common/city.c (original)
+++ trunk/common/city.c Thu May  5 08:16:57 2016
@@ -1973,7 +1973,7 @@
   steps).
 **************************************************************************/
 bool is_friendly_city_near(const struct player *owner,
-                          const struct tile *ptile)
+                           const struct tile *ptile)
 {
   square_iterate(ptile, 3, ptile1) {
     struct city *pcity = tile_city(ptile1);

Modified: trunk/common/unit.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/unit.c?rev=32586&r1=32585&r2=32586&view=diff
==============================================================================
--- trunk/common/unit.c (original)
+++ trunk/common/unit.c Thu May  5 08:16:57 2016
@@ -1521,9 +1521,9 @@
   if (tile_has_base_flag_for_unit(unit_tile(punit),
                                   unit_type_get(punit),
                                   BF_NOT_AGGRESSIVE)) {
-    return !is_unit_near_a_friendly_city (punit);
-  }
-  
+    return !is_unit_near_a_friendly_city(punit);
+  }
+
   return TRUE;
 }
 

Modified: trunk/data/alien/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/terrain.ruleset?rev=32586&r1=32585&r2=32586&view=diff
==============================================================================
--- trunk/data/alien/terrain.ruleset    (original)
+++ trunk/data/alien/terrain.ruleset    Thu May  5 08:16:57 2016
@@ -1176,13 +1176,14 @@
 ;
 ; extra                   = name of the extra this base section is part of
 ; gui_type                = How gui should handle this base.
-;                           Fortress/Airbase/Other
+;                           Value can be "Fortress", "Airbase", or "Other"
 ; border_sq               = Base will claim land ownership up to this radius,
 ;                           -1 to disable. If enabled, base cannot exist in 
city tile.
 ; vision_main_sq          = Base will have main layer vision to this radius
 ; vision_invis_sq         = Base will have invisible layer vision to this 
radius
 ; flags
-;   - "NoAggressive"      = Units inside are not considered aggressive
+;   - "NoAggressive"      = Units inside are not considered aggressive if 
there`s
+;                           friendly city within 3 tiles
 ;   - "NoStackDeath"      = Units inside do not die all at once when attacked
 ;
 ; */ <-- avoid gettext warnings

Modified: trunk/data/civ1/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/terrain.ruleset?rev=32586&r1=32585&r2=32586&view=diff
==============================================================================
--- trunk/data/civ1/terrain.ruleset     (original)
+++ trunk/data/civ1/terrain.ruleset     Thu May  5 08:16:57 2016
@@ -1177,15 +1177,15 @@
 ;
 ; extra                   = name of the extra this base section is part of
 ; gui_type                = How gui should handle this base.
-;                           Fortress/Airbase/Other
+;                           Value can be "Fortress", "Airbase", or "Other"
 ; border_sq               = Base will claim land ownership up to this radius,
 ;                           -1 to disable. If enabled, base cannot exist in 
city tile.
 ; vision_main_sq          = Base will have main layer vision to this radius
 ; vision_invis_sq         = Base will have invisible layer vision to this 
radius
 ; flags
-;   - "NoAggressive"      = Units inside are not considered aggressive
+;   - "NoAggressive"      = Units inside are not considered aggressive if 
there`s
+;                           friendly city within 3 tiles
 ;   - "NoStackDeath"      = Units inside do not die all at once when attacked
-;   - "ClaimTerritory"    = Base will claim land ownership
 ;
 ; */ <-- avoid gettext warnings
 

Modified: trunk/data/civ2/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/terrain.ruleset?rev=32586&r1=32585&r2=32586&view=diff
==============================================================================
--- trunk/data/civ2/terrain.ruleset     (original)
+++ trunk/data/civ2/terrain.ruleset     Thu May  5 08:16:57 2016
@@ -1446,13 +1446,14 @@
 ;
 ; extra                   = name of the extra this base section is part of
 ; gui_type                = How gui should handle this base.
-;                           Fortress/Airbase/Other
+;                           Value can be "Fortress", "Airbase", or "Other"
 ; border_sq               = Base will claim land ownership up to this radius,
 ;                           -1 to disable. If enabled, base cannot exist in 
city tile.
 ; vision_main_sq          = Base will have main layer vision to this radius
 ; vision_invis_sq         = Base will have invisible layer vision to this 
radius
 ; flags
-;   - "NoAggressive"      = Units inside are not considered aggressive
+;   - "NoAggressive"      = Units inside are not considered aggressive if 
there`s
+;                           friendly city within 3 tiles
 ;   - "NoStackDeath"      = Units inside do not die all at once when attacked
 ;
 ; */ <-- avoid gettext warnings

Modified: trunk/data/civ2civ3/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/terrain.ruleset?rev=32586&r1=32585&r2=32586&view=diff
==============================================================================
--- trunk/data/civ2civ3/terrain.ruleset (original)
+++ trunk/data/civ2civ3/terrain.ruleset Thu May  5 08:16:57 2016
@@ -1888,13 +1888,14 @@
 ;
 ; extra                   = name of the extra this base section is part of
 ; gui_type                = How gui should handle this base.
-;                           Fortress/Airbase/Other
+;                           Value can be "Fortress", "Airbase", or "Other"
 ; border_sq               = Base will claim land ownership up to this radius,
 ;                           -1 to disable. If enabled, base cannot exist in 
city tile.
 ; vision_main_sq          = Base will have main layer vision to this radius
 ; vision_invis_sq         = Base will have invisible layer vision to this 
radius
 ; flags
-;   - "NoAggressive"      = Units inside are not considered aggressive
+;   - "NoAggressive"      = Units inside are not considered aggressive if 
there`s
+;                           friendly city within 3 tiles
 ;   - "NoStackDeath"      = Units inside do not die all at once when attacked
 ;
 ; */ <-- avoid gettext warnings

Modified: trunk/data/classic/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/terrain.ruleset?rev=32586&r1=32585&r2=32586&view=diff
==============================================================================
--- trunk/data/classic/terrain.ruleset  (original)
+++ trunk/data/classic/terrain.ruleset  Thu May  5 08:16:57 2016
@@ -1710,13 +1710,14 @@
 ;
 ; extra                   = name of the extra this base section is part of
 ; gui_type                = How gui should handle this base.
-;                           Fortress/Airbase/Other
+;                           Value can be "Fortress", "Airbase", or "Other"
 ; border_sq               = Base will claim land ownership up to this radius,
 ;                           -1 to disable. If enabled, base cannot exist in 
city tile.
 ; vision_main_sq          = Base will have main layer vision to this radius
 ; vision_invis_sq         = Base will have invisible layer vision to this 
radius
 ; flags
-;   - "NoAggressive"      = Units inside are not considered aggressive
+;   - "NoAggressive"      = Units inside are not considered aggressive if 
there`s
+;                           friendly city within 3 tiles
 ;   - "NoStackDeath"      = Units inside do not die all at once when attacked
 ;
 ; */ <-- avoid gettext warnings

Modified: trunk/data/experimental/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/terrain.ruleset?rev=32586&r1=32585&r2=32586&view=diff
==============================================================================
--- trunk/data/experimental/terrain.ruleset     (original)
+++ trunk/data/experimental/terrain.ruleset     Thu May  5 08:16:57 2016
@@ -1728,13 +1728,14 @@
 ;
 ; extra                   = name of the extra this base section is part of
 ; gui_type                = How gui should handle this base.
-;                           Fortress/Airbase/Other
+;                           Value can be "Fortress", "Airbase", or "Other"
 ; border_sq               = Base will claim land ownership up to this radius,
 ;                           -1 to disable. If enabled, base cannot exist in 
city tile.
 ; vision_main_sq          = Base will have main layer vision to this radius
 ; vision_invis_sq         = Base will have invisible layer vision to this 
radius
 ; flags
-;   - "NoAggressive"      = Units inside are not considered aggressive
+;   - "NoAggressive"      = Units inside are not considered aggressive if 
there`s
+;                           friendly city within 3 tiles
 ;   - "NoStackDeath"      = Units inside do not die all at once when attacked
 ;
 ; */ <-- avoid gettext warnings

Modified: trunk/data/multiplayer/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/terrain.ruleset?rev=32586&r1=32585&r2=32586&view=diff
==============================================================================
--- trunk/data/multiplayer/terrain.ruleset      (original)
+++ trunk/data/multiplayer/terrain.ruleset      Thu May  5 08:16:57 2016
@@ -1682,13 +1682,14 @@
 ;
 ; extra                   = name of the extra this base section is part of
 ; gui_type                = How gui should handle this base.
-;                           Fortress/Airbase/Other
+;                           Value can be "Fortress", "Airbase", or "Other"
 ; border_sq               = Base will claim land ownership up to this radius,
 ;                           -1 to disable. If enabled, base cannot exist in 
city tile.
 ; vision_main_sq          = Base will have main layer vision to this radius
 ; vision_invis_sq         = Base will have invisible layer vision to this 
radius
 ; flags
-;   - "NoAggressive"      = Units inside are not considered aggressive
+;   - "NoAggressive"      = Units inside are not considered aggressive if 
there`s
+;                           friendly city within 3 tiles
 ;   - "NoStackDeath"      = Units inside do not die all at once when attacked
 ;
 ; */ <-- avoid gettext warnings

Modified: trunk/data/sandbox/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/terrain.ruleset?rev=32586&r1=32585&r2=32586&view=diff
==============================================================================
--- trunk/data/sandbox/terrain.ruleset  (original)
+++ trunk/data/sandbox/terrain.ruleset  Thu May  5 08:16:57 2016
@@ -1870,13 +1870,14 @@
 ;
 ; extra                   = name of the extra this base section is part of
 ; gui_type                = How gui should handle this base.
-;                           Fortress/Airbase/Other
+;                           Value can be "Fortress", "Airbase", or "Other"
 ; border_sq               = Base will claim land ownership up to this radius,
 ;                           -1 to disable. If enabled, base cannot exist in 
city tile.
 ; vision_main_sq          = Base will have main layer vision to this radius
 ; vision_invis_sq         = Base will have invisible layer vision to this 
radius
 ; flags
-;   - "NoAggressive"      = Units inside are not considered aggressive
+;   - "NoAggressive"      = Units inside are not considered aggressive if 
there`s
+;                           friendly city within 3 tiles
 ;   - "NoStackDeath"      = Units inside do not die all at once when attacked
 ;
 ; */ <-- avoid gettext warnings

Modified: trunk/data/stub/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/stub/terrain.ruleset?rev=32586&r1=32585&r2=32586&view=diff
==============================================================================
--- trunk/data/stub/terrain.ruleset     (original)
+++ trunk/data/stub/terrain.ruleset     Thu May  5 08:16:57 2016
@@ -481,13 +481,14 @@
 ;
 ; extra                   = name of the extra this base section is part of
 ; gui_type                = How gui should handle this base.
-;                           Fortress/Airbase/Other
+;                           Value can be "Fortress", "Airbase", or "Other"
 ; border_sq               = Base will claim land ownership up to this radius,
 ;                           -1 to disable. If enabled, base cannot exist in 
city tile.
 ; vision_main_sq          = Base will have main layer vision to this radius
 ; vision_invis_sq         = Base will have invisible layer vision to this 
radius
 ; flags
-;   - "NoAggressive"      = Units inside are not considered aggressive
+;   - "NoAggressive"      = Units inside are not considered aggressive if 
there`s
+;                           friendly city within 3 tiles
 ;   - "NoStackDeath"      = Units inside do not die all at once when attacked
 ;
 ; */ <-- avoid gettext warnings


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

Reply via email to