Author: cazfi
Date: Thu May 5 08:17:21 2016
New Revision: 32588
URL: http://svn.gna.org/viewcvs/freeciv?rev=32588&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_5/common/city.c
branches/S2_5/common/unit.c
branches/S2_5/data/alien/terrain.ruleset
branches/S2_5/data/civ1/terrain.ruleset
branches/S2_5/data/civ2/terrain.ruleset
branches/S2_5/data/civ2civ3/terrain.ruleset
branches/S2_5/data/classic/terrain.ruleset
branches/S2_5/data/experimental/terrain.ruleset
branches/S2_5/data/multiplayer/terrain.ruleset
Modified: branches/S2_5/common/city.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/city.c?rev=32588&r1=32587&r2=32588&view=diff
==============================================================================
--- branches/S2_5/common/city.c (original)
+++ branches/S2_5/common/city.c Thu May 5 08:17:21 2016
@@ -1864,7 +1864,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_5/common/unit.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/unit.c?rev=32588&r1=32587&r2=32588&view=diff
==============================================================================
--- branches/S2_5/common/unit.c (original)
+++ branches/S2_5/common/unit.c Thu May 5 08:17:21 2016
@@ -1821,9 +1821,9 @@
if (tile_has_base_flag_for_unit(unit_tile(punit),
unit_type(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_5/data/alien/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/alien/terrain.ruleset?rev=32588&r1=32587&r2=32588&view=diff
==============================================================================
--- branches/S2_5/data/alien/terrain.ruleset (original)
+++ branches/S2_5/data/alien/terrain.ruleset Thu May 5 08:17:21 2016
@@ -599,7 +599,7 @@
; reqs = requirements to build the base (see effects.ruleset
; and README.effects for help on requirements)
; gui_type = how gui should handle this base.
-; Fortress/Airbase/Other
+; Value can be "Fortress", "Airbase", or "Other"
; build_time = how long it takes a unit to build this base.
; Value of 0 (default) means that terrain-specific
; base_time is used instead.
@@ -614,7 +614,8 @@
; native_to = List of unit classes that are considered to
; be inside the base when they are on same tile
; 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_5/data/civ1/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ1/terrain.ruleset?rev=32588&r1=32587&r2=32588&view=diff
==============================================================================
--- branches/S2_5/data/civ1/terrain.ruleset (original)
+++ branches/S2_5/data/civ1/terrain.ruleset Thu May 5 08:17:21 2016
@@ -733,7 +733,7 @@
; reqs = requirements to build the base (see effects.ruleset
; and README.effects for help on requirements)
; gui_type = how gui should handle this base.
-; Fortress/Airbase/Other
+; Value can be "Fortress", "Airbase", or "Other"
; build_time = how long it takes a unit to build this base.
; Value of 0 (default) means that terrain-specific
; base_time is used instead.
@@ -748,9 +748,9 @@
; native_to = List of unit classes that are considered to
; be inside the base when they are on same tile
; 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
; - "NativeTile" = Native units consider tile native regardless of
Modified: branches/S2_5/data/civ2/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2/terrain.ruleset?rev=32588&r1=32587&r2=32588&view=diff
==============================================================================
--- branches/S2_5/data/civ2/terrain.ruleset (original)
+++ branches/S2_5/data/civ2/terrain.ruleset Thu May 5 08:17:21 2016
@@ -826,7 +826,7 @@
; reqs = requirements to build the base (see effects.ruleset
; and README.effects for help on requirements)
; gui_type = how gui should handle this base.
-; Fortress/Airbase/Other
+; Value can be "Fortress", "Airbase", or "Other"
; build_time = how long it takes a unit to build this base.
; Value of 0 (default) means that terrain-specific
; base_time is used instead.
@@ -841,7 +841,8 @@
; native_to = List of unit classes that are considered to
; be inside the base when they are on same tile
; 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_5/data/civ2civ3/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/terrain.ruleset?rev=32588&r1=32587&r2=32588&view=diff
==============================================================================
--- branches/S2_5/data/civ2civ3/terrain.ruleset (original)
+++ branches/S2_5/data/civ2civ3/terrain.ruleset Thu May 5 08:17:21 2016
@@ -1009,7 +1009,7 @@
; reqs = requirements to build the base (see effects.ruleset
; and README.effects for help on requirements)
; gui_type = how gui should handle this base.
-; Fortress/Airbase/Other
+; Value can be "Fortress", "Airbase", or "Other"
; build_time = how long it takes a unit to build this base.
; Value of 0 (default) means that terrain-specific
; base_time is used instead.
@@ -1024,7 +1024,8 @@
; native_to = List of unit classes that are considered to
; be inside the base when they are on same tile
; 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_5/data/classic/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/classic/terrain.ruleset?rev=32588&r1=32587&r2=32588&view=diff
==============================================================================
--- branches/S2_5/data/classic/terrain.ruleset (original)
+++ branches/S2_5/data/classic/terrain.ruleset Thu May 5 08:17:21 2016
@@ -995,7 +995,7 @@
; reqs = requirements to build the base (see effects.ruleset
; and README.effects for help on requirements)
; gui_type = how gui should handle this base.
-; Fortress/Airbase/Other
+; Value can be "Fortress", "Airbase", or "Other"
; build_time = how long it takes a unit to build this base.
; Value of 0 (default) means that terrain-specific
; base_time is used instead.
@@ -1010,7 +1010,8 @@
; native_to = List of unit classes that are considered to
; be inside the base when they are on same tile
; 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_5/data/experimental/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/experimental/terrain.ruleset?rev=32588&r1=32587&r2=32588&view=diff
==============================================================================
--- branches/S2_5/data/experimental/terrain.ruleset (original)
+++ branches/S2_5/data/experimental/terrain.ruleset Thu May 5 08:17:21 2016
@@ -971,7 +971,7 @@
; reqs = requirements to build the base (see effects.ruleset
; and README.effects for help on requirements)
; gui_type = how gui should handle this base.
-; Fortress/Airbase/Other
+; Value can be "Fortress", "Airbase", or "Other"
; build_time = how long it takes a unit to build this base.
; Value of 0 (default) means that terrain-specific
; base_time is used instead.
@@ -986,7 +986,8 @@
; native_to = List of unit classes that are considered to
; be inside the base when they are on same tile
; 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_5/data/multiplayer/terrain.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/multiplayer/terrain.ruleset?rev=32588&r1=32587&r2=32588&view=diff
==============================================================================
--- branches/S2_5/data/multiplayer/terrain.ruleset (original)
+++ branches/S2_5/data/multiplayer/terrain.ruleset Thu May 5 08:17:21 2016
@@ -969,7 +969,7 @@
; reqs = requirements to build the base (see effects.ruleset
; and README.effects for help on requirements)
; gui_type = how gui should handle this base.
-; Fortress/Airbase/Other
+; Value can be "Fortress", "Airbase", or "Other"
; build_time = how long it takes a unit to build this base.
; Value of 0 (default) means that terrain-specific
; base_time is used instead.
@@ -984,7 +984,8 @@
; native_to = List of unit classes that are considered to
; be inside the base when they are on same tile
; 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
