Author: cazfi
Date: Mon Nov 7 06:01:43 2016
New Revision: 34430
URL: http://svn.gna.org/viewcvs/freeciv?rev=34430&view=rev
Log:
Simplify rulesets that have just one unit class having "AttFromNonNative" flag
to use direct
"UnitClass" requirements instead.
See patch #7944
Modified:
trunk/data/alien/game.ruleset
trunk/data/alien/units.ruleset
trunk/data/civ1/game.ruleset
trunk/data/civ1/units.ruleset
trunk/data/civ2/game.ruleset
trunk/data/civ2/units.ruleset
Modified: trunk/data/alien/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=34430&r1=34429&r2=34430&view=diff
==============================================================================
--- trunk/data/alien/game.ruleset (original)
+++ trunk/data/alien/game.ruleset Mon Nov 7 06:01:43 2016
@@ -515,10 +515,10 @@
[actionenabler_attack_att_from_non_native]
action = "Attack"
actor_reqs =
- { "type", "name", "range", "present"
- "UnitFlag", "NonMil", "Local", FALSE
- "MinMoveFrags", "1", "Local", TRUE
- "UnitClassFlag", "AttFromNonNative", "Local", TRUE
+ { "type", "name", "range", "present"
+ "UnitFlag", "NonMil", "Local", FALSE
+ "MinMoveFrags", "1", "Local", TRUE
+ "UnitClass", "Sea", "Local", TRUE
}
[actionenabler_conquer_city_native]
@@ -539,12 +539,12 @@
[actionenabler_conquer_city_att_from_non_native]
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
- "UnitClassFlag", "AttFromNonNative", "Local", TRUE
+ { "type", "name", "range", "present"
+ "UnitClassFlag", "CanOccupyCity", "Local", TRUE
+ "UnitFlag", "NonMil", "Local", FALSE
+ "DiplRel", "War", "Local", TRUE
+ "MinMoveFrags", "1", "Local", TRUE
+ "UnitClass", "Sea", "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=34430&r1=34429&r2=34430&view=diff
==============================================================================
--- trunk/data/alien/units.ruleset (original)
+++ trunk/data/alien/units.ruleset Mon Nov 7 06:01:43 2016
@@ -44,7 +44,6 @@
class_flags =
{ "name", "helptxt"
_("Airliftable"), _("Can be airlifted from a suitable city.")
- _("AttFromNonNative"), _("Can launch attack from non-native tiles.")
}
[veteran_system]
@@ -147,8 +146,10 @@
name = _("?unitclass:Sea")
min_speed = 1
hp_loss_pct = 0
-flags = "DamageSlows", "TerrainSpeed", "CanPillage", "AttackNonNative",
- "AttFromNonNative"
+flags = "DamageSlows", "TerrainSpeed", "CanPillage", "AttackNonNative"
+helptext = _("\
+Can launch attack from non-native tiles.\
+")
[unitclass_amphibious]
name = _("?unitclass:Amphibious")
Modified: trunk/data/civ1/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=34430&r1=34429&r2=34430&view=diff
==============================================================================
--- trunk/data/civ1/game.ruleset (original)
+++ trunk/data/civ1/game.ruleset Mon Nov 7 06:01:43 2016
@@ -480,10 +480,10 @@
[actionenabler_attack_att_from_non_native]
action = "Attack"
actor_reqs =
- { "type", "name", "range", "present"
- "UnitFlag", "NonMil", "Local", FALSE
- "MinMoveFrags", "1", "Local", TRUE
- "UnitClassFlag", "AttFromNonNative", "Local", TRUE
+ { "type", "name", "range", "present"
+ "UnitFlag", "NonMil", "Local", FALSE
+ "MinMoveFrags", "1", "Local", TRUE
+ "UnitClass", "Sea", "Local", TRUE
}
[actionenabler_conquer_city_native]
@@ -504,12 +504,12 @@
[actionenabler_conquer_city_att_from_non_native]
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
- "UnitClassFlag", "AttFromNonNative", "Local", TRUE
+ { "type", "name", "range", "present"
+ "UnitClassFlag", "CanOccupyCity", "Local", TRUE
+ "UnitFlag", "NonMil", "Local", FALSE
+ "DiplRel", "War", "Local", TRUE
+ "MinMoveFrags", "1", "Local", TRUE
+ "UnitClass", "Sea", "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=34430&r1=34429&r2=34430&view=diff
==============================================================================
--- trunk/data/civ1/units.ruleset (original)
+++ trunk/data/civ1/units.ruleset Mon Nov 7 06:01:43 2016
@@ -35,10 +35,9 @@
; and sensible.
; helptxt = displayed in the help for unit types belonging to a class
; with this flag (optional)
-class_flags =
- { "name", "helptxt"
- _("AttFromNonNative"), _("Can launch attack from non-native tiles.")
- }
+;class_flags =
+; { "name", "helptxt"
+; }
[veteran_system]
; What are the names of the levels?
@@ -137,7 +136,10 @@
name = _("?unitclass:Sea")
min_speed = 2
hp_loss_pct = 0
-flags = "DamageSlows", "AttackNonNative", "AttFromNonNative"
+flags = "DamageSlows", "AttackNonNative"
+helptext = _("\
+Can launch attack from non-native tiles.\
+")
[unitclass_air]
; /* TRANS: Unit class: used adjectivally */
Modified: trunk/data/civ2/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=34430&r1=34429&r2=34430&view=diff
==============================================================================
--- trunk/data/civ2/game.ruleset (original)
+++ trunk/data/civ2/game.ruleset Mon Nov 7 06:01:43 2016
@@ -573,10 +573,10 @@
[actionenabler_attack_att_from_non_native]
action = "Attack"
actor_reqs =
- { "type", "name", "range", "present"
- "UnitFlag", "NonMil", "Local", FALSE
- "MinMoveFrags", "1", "Local", TRUE
- "UnitClassFlag", "AttFromNonNative", "Local", TRUE
+ { "type", "name", "range", "present"
+ "UnitFlag", "NonMil", "Local", FALSE
+ "MinMoveFrags", "1", "Local", TRUE
+ "UnitClass", "Sea", "Local", TRUE
}
[actionenabler_conquer_city_native]
@@ -612,12 +612,12 @@
[actionenabler_conquer_city_att_from_non_native]
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
- "UnitClassFlag", "AttFromNonNative", "Local", TRUE
+ { "type", "name", "range", "present"
+ "UnitClassFlag", "CanOccupyCity", "Local", TRUE
+ "UnitFlag", "NonMil", "Local", FALSE
+ "DiplRel", "War", "Local", TRUE
+ "MinMoveFrags", "1", "Local", TRUE
+ "UnitClass", "Sea", "Local", TRUE
}
target_reqs =
{ "type", "name", "range", "present"
Modified: trunk/data/civ2/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/units.ruleset?rev=34430&r1=34429&r2=34430&view=diff
==============================================================================
--- trunk/data/civ2/units.ruleset (original)
+++ trunk/data/civ2/units.ruleset Mon Nov 7 06:01:43 2016
@@ -42,10 +42,9 @@
; and sensible.
; helptxt = displayed in the help for unit types belonging to a class
; with this flag (optional)
-class_flags =
- { "name", "helptxt"
- _("AttFromNonNative"), _("Can launch attack from non-native tiles.")
- }
+;class_flags =
+; { "name", "helptxt"
+; }
[veteran_system]
; What are the names of the levels?
@@ -152,7 +151,10 @@
name = _("?unitclass:Sea")
min_speed = 2
hp_loss_pct = 0
-flags = "DamageSlows", "AttackNonNative", "AttFromNonNative"
+flags = "DamageSlows", "AttackNonNative"
+helptext = _("\
+Can launch attack from non-native tiles.\
+")
[unitclass_heli]
; /* TRANS: Unit class: used adjectivally */
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
