Author: cazfi
Date: Thu May 5 08:17:10 2016
New Revision: 32587
URL: http://svn.gna.org/viewcvs/freeciv?rev=32587&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:
branches/S2_6/common/city.c
branches/S2_6/common/unit.c
branches/S2_6/data/alien/terrain.ruleset
branches/S2_6/data/civ1/terrain.ruleset
branches/S2_6/data/civ2/terrain.ruleset
branches/S2_6/data/civ2civ3/terrain.ruleset
branches/S2_6/data/classic/terrain.ruleset
branches/S2_6/data/experimental/terrain.ruleset
branches/S2_6/data/multiplayer/terrain.ruleset
branches/S2_6/data/sandbox/terrain.ruleset
branches/S2_6/data/stub/terrain.ruleset
Modified: branches/S2_6/common/city.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/city.c?rev=32587&r1=32586&r2=32587&view=diff
==============================================================================
--- branches/S2_6/common/city.c (original)
+++ branches/S2_6/common/city.c Thu May 5 08:17:10 2016
@@ -1822,7 +1822,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: branches/S2_6/common/unit.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/unit.c?rev=32587&r1=32586&r2=32587&view=diff
==============================================================================
--- branches/S2_6/common/unit.c (original)
+++ branches/S2_6/common/unit.c Thu May 5 08:17:10 2016
@@ -1640,9 +1640,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: branches/S2_6/data/alien/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/alien/terrain.ruleset?rev=32587&r1=32586&r2=32587&view=diff
==============================================================================
--- branches/S2_6/data/alien/terrain.ruleset (original)
+++ branches/S2_6/data/alien/terrain.ruleset Thu May 5 08:17:10 2016
@@ -1087,13 +1087,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
; - "DiplomatDefense" = Diplomats inside get bonus to diplomatic defense
; - "ParadropFrom" = Paradrop can be initiated from base
Modified: branches/S2_6/data/civ1/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ1/terrain.ruleset?rev=32587&r1=32586&r2=32587&view=diff
==============================================================================
--- branches/S2_6/data/civ1/terrain.ruleset (original)
+++ branches/S2_6/data/civ1/terrain.ruleset Thu May 5 08:17:10 2016
@@ -1044,15 +1044,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
; - "DiplomatDefense" = Diplomats inside get bonus to diplomatic defense
; - "ParadropFrom" = Paradrop can be initiated from base
;
Modified: branches/S2_6/data/civ2/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2/terrain.ruleset?rev=32587&r1=32586&r2=32587&view=diff
==============================================================================
--- branches/S2_6/data/civ2/terrain.ruleset (original)
+++ branches/S2_6/data/civ2/terrain.ruleset Thu May 5 08:17:10 2016
@@ -1192,13 +1192,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
; - "DiplomatDefense" = Diplomats inside get bonus to diplomatic defense
; - "ParadropFrom" = Paradrop can be initiated from base
Modified: branches/S2_6/data/civ2civ3/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/terrain.ruleset?rev=32587&r1=32586&r2=32587&view=diff
==============================================================================
--- branches/S2_6/data/civ2civ3/terrain.ruleset (original)
+++ branches/S2_6/data/civ2civ3/terrain.ruleset Thu May 5 08:17:10 2016
@@ -1646,13 +1646,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
; - "DiplomatDefense" = Diplomats inside get bonus to diplomatic defense
; - "ParadropFrom" = Paradrop can be initiated from base
Modified: branches/S2_6/data/classic/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/terrain.ruleset?rev=32587&r1=32586&r2=32587&view=diff
==============================================================================
--- branches/S2_6/data/classic/terrain.ruleset (original)
+++ branches/S2_6/data/classic/terrain.ruleset Thu May 5 08:17:10 2016
@@ -1465,13 +1465,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
; - "DiplomatDefense" = Diplomats inside get bonus to diplomatic defense
; - "ParadropFrom" = Paradrop can be initiated from base
Modified: branches/S2_6/data/experimental/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/experimental/terrain.ruleset?rev=32587&r1=32586&r2=32587&view=diff
==============================================================================
--- branches/S2_6/data/experimental/terrain.ruleset (original)
+++ branches/S2_6/data/experimental/terrain.ruleset Thu May 5 08:17:10 2016
@@ -1485,13 +1485,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
; - "DiplomatDefense" = Diplomats inside get bonus to diplomatic defense
; - "ParadropFrom" = Paradrop can be initiated from base
Modified: branches/S2_6/data/multiplayer/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/multiplayer/terrain.ruleset?rev=32587&r1=32586&r2=32587&view=diff
==============================================================================
--- branches/S2_6/data/multiplayer/terrain.ruleset (original)
+++ branches/S2_6/data/multiplayer/terrain.ruleset Thu May 5 08:17:10 2016
@@ -1439,13 +1439,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
; - "DiplomatDefense" = Diplomats inside get bonus to diplomatic defense
; - "ParadropFrom" = Paradrop can be initiated from base
Modified: branches/S2_6/data/sandbox/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/sandbox/terrain.ruleset?rev=32587&r1=32586&r2=32587&view=diff
==============================================================================
--- branches/S2_6/data/sandbox/terrain.ruleset (original)
+++ branches/S2_6/data/sandbox/terrain.ruleset Thu May 5 08:17:10 2016
@@ -1627,13 +1627,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
; - "DiplomatDefense" = Diplomats inside get bonus to diplomatic defense
; - "ParadropFrom" = Paradrop can be initiated from base
Modified: branches/S2_6/data/stub/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/stub/terrain.ruleset?rev=32587&r1=32586&r2=32587&view=diff
==============================================================================
--- branches/S2_6/data/stub/terrain.ruleset (original)
+++ branches/S2_6/data/stub/terrain.ruleset Thu May 5 08:17:10 2016
@@ -450,13 +450,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
; - "DiplomatDefense" = Diplomats inside get bonus to diplomatic defense
; - "ParadropFrom" = Paradrop can be initiated from base
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
