Author: sveinung
Date: Wed Oct 19 14:21:31 2016
New Revision: 34180
URL: http://svn.gna.org/viewcvs/freeciv?rev=34180&view=rev
Log:
Remove "Marines" utype flag from alien and civ1.
The alien ruleset and the civ1 ruleset doesn't have any unit types that uses
the "Marines" unit type flag. Remove it.
See patch #7844
Modified:
trunk/data/alien/game.ruleset
trunk/data/alien/units.ruleset
trunk/data/civ1/game.ruleset
trunk/data/civ1/units.ruleset
Modified: trunk/data/alien/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=34180&r1=34179&r2=34180&view=diff
==============================================================================
--- trunk/data/alien/game.ruleset (original)
+++ trunk/data/alien/game.ruleset Wed Oct 19 14:21:31 2016
@@ -503,15 +503,6 @@
"UnitState", "OnNativeTile", "Local", TRUE
}
-[actionenabler_attack_marines]
-action = "Attack"
-actor_reqs =
- { "type", "name", "range", "present"
- "UnitFlag", "NonMil", "Local", FALSE
- "MinMoveFrags", "1", "Local", TRUE
- "UnitFlag", "Marines", "Local", TRUE
- }
-
[actionenabler_attack_att_from_non_native]
action = "Attack"
actor_reqs =
@@ -530,21 +521,6 @@
"DiplRel", "War", "Local", TRUE
"MinMoveFrags", "1", "Local", TRUE
"UnitState", "OnLivableTile", "Local", TRUE
- }
-target_reqs =
- { "type", "name", "range", "present"
- "MaxUnitsOnTile", "0", "Local", TRUE
- }
-
-[actionenabler_conquer_city_marines]
-action = "Conquer City"
-actor_reqs =
- { "type", "name", "range", "present"
- "UnitClassFlag", "CanOccupyCity", "Local", TRUE
- "UnitFlag", "NonMil", "Local", FALSE
- "DiplRel", "War", "Local", TRUE
- "MinMoveFrags", "1", "Local", TRUE
- "UnitFlag", "Marines", "Local", TRUE
}
target_reqs =
{ "type", "name", "range", "present"
Modified: trunk/data/alien/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/units.ruleset?rev=34180&r1=34179&r2=34180&view=diff
==============================================================================
--- trunk/data/alien/units.ruleset (original)
+++ trunk/data/alien/units.ruleset Wed Oct 19 14:21:31 2016
@@ -33,7 +33,6 @@
_("AddToCity")
_("Infra"), _("Can build infrastructure.")
_("Paratroopers"), _("Can be paradropped from a friendly city or suitable
base.")
- _("Marines"), _("Can launch attack from non-native tiles.")
}
; Names for custom unit class flags. There can be up to 8 of these.
Modified: trunk/data/civ1/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=34180&r1=34179&r2=34180&view=diff
==============================================================================
--- trunk/data/civ1/game.ruleset (original)
+++ trunk/data/civ1/game.ruleset Wed Oct 19 14:21:31 2016
@@ -468,15 +468,6 @@
"UnitState", "OnNativeTile", "Local", TRUE
}
-[actionenabler_attack_marines]
-action = "Attack"
-actor_reqs =
- { "type", "name", "range", "present"
- "UnitFlag", "NonMil", "Local", FALSE
- "MinMoveFrags", "1", "Local", TRUE
- "UnitFlag", "Marines", "Local", TRUE
- }
-
[actionenabler_attack_att_from_non_native]
action = "Attack"
actor_reqs =
@@ -495,21 +486,6 @@
"DiplRel", "War", "Local", TRUE
"MinMoveFrags", "1", "Local", TRUE
"UnitState", "OnLivableTile", "Local", TRUE
- }
-target_reqs =
- { "type", "name", "range", "present"
- "MaxUnitsOnTile", "0", "Local", TRUE
- }
-
-[actionenabler_conquer_city_marines]
-action = "Conquer City"
-actor_reqs =
- { "type", "name", "range", "present"
- "UnitClassFlag", "CanOccupyCity", "Local", TRUE
- "UnitFlag", "NonMil", "Local", FALSE
- "DiplRel", "War", "Local", TRUE
- "MinMoveFrags", "1", "Local", TRUE
- "UnitFlag", "Marines", "Local", TRUE
}
target_reqs =
{ "type", "name", "range", "present"
Modified: trunk/data/civ1/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/units.ruleset?rev=34180&r1=34179&r2=34180&view=diff
==============================================================================
--- trunk/data/civ1/units.ruleset (original)
+++ trunk/data/civ1/units.ruleset Wed Oct 19 14:21:31 2016
@@ -27,7 +27,6 @@
_("AddToCity")
_("Nuclear")
_("Infra"), _("Can build infrastructure.")
- _("Marines"), _("Can launch attack from non-native tiles.")
}
; Names for custom unit class flags. There can be up to 8 of these.
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
