Author: cazfi
Date: Fri Oct 28 20:29:47 2016
New Revision: 34281

URL: http://svn.gna.org/viewcvs/freeciv?rev=34281&view=rev
Log:
Simplify rulesets that have just one extra having "ParadropFrom" flag to use 
direct
"Extra" requirements instead.

See patch #7886

Modified:
    trunk/data/alien/game.ruleset
    trunk/data/alien/terrain.ruleset
    trunk/data/civ2/game.ruleset
    trunk/data/civ2/terrain.ruleset
    trunk/data/classic/game.ruleset
    trunk/data/classic/terrain.ruleset
    trunk/data/experimental/game.ruleset
    trunk/data/experimental/terrain.ruleset
    trunk/data/multiplayer/game.ruleset
    trunk/data/multiplayer/terrain.ruleset
    trunk/data/webperimental/game.ruleset
    trunk/data/webperimental/terrain.ruleset

Modified: trunk/data/alien/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=34281&r1=34280&r2=34281&view=diff
==============================================================================
--- trunk/data/alien/game.ruleset       (original)
+++ trunk/data/alien/game.ruleset       Fri Oct 28 20:29:47 2016
@@ -557,7 +557,7 @@
     { "type",      "name",         "range", "present"
       "UnitFlag",  "Paratroopers", "Local", TRUE
       "UnitState", "Transporting", "Local", FALSE
-      "ExtraFlag", "ParadropFrom", "Local", TRUE
+      "Extra",     "Antigrav Base","Local", TRUE
     }
 
 [actionenabler_paradrop_city]

Modified: trunk/data/alien/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/terrain.ruleset?rev=34281&r1=34280&r2=34281&view=diff
==============================================================================
--- trunk/data/alien/terrain.ruleset    (original)
+++ trunk/data/alien/terrain.ruleset    Fri Oct 28 20:29:47 2016
@@ -34,10 +34,9 @@
 ;                 and sensible.
 ; helptxt       = displayed in the help for extra types with this flag
 ;                 (optional)
-extra_flags =
-  { "name", "helptxt"
-    _("ParadropFrom"), _("Units can paradrop from this tile.")
-  }
+;extra_flags =
+;  { "name", "helptxt"
+;  }
 
 [parameters]
 
@@ -901,7 +900,9 @@
 build_time     = 3
 removal_time   = 0
 native_to      = "Antigravity"
-flags          = "ParadropFrom"
+helptext       = _("\
+Units can paradrop from this tile.
+")
 
 [extra_road]
 name           = _("Road")

Modified: trunk/data/civ2/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=34281&r1=34280&r2=34281&view=diff
==============================================================================
--- trunk/data/civ2/game.ruleset        (original)
+++ trunk/data/civ2/game.ruleset        Fri Oct 28 20:29:47 2016
@@ -630,7 +630,7 @@
     { "type",      "name",         "range", "present"
       "UnitFlag",  "Paratroopers", "Local", TRUE
       "UnitState", "Transporting", "Local", FALSE
-      "ExtraFlag", "ParadropFrom", "Local", TRUE
+      "Extra",     "Airbase",      "Local", TRUE
     }
 
 [actionenabler_paradrop_city]

Modified: trunk/data/civ2/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/terrain.ruleset?rev=34281&r1=34280&r2=34281&view=diff
==============================================================================
--- trunk/data/civ2/terrain.ruleset     (original)
+++ trunk/data/civ2/terrain.ruleset     Fri Oct 28 20:29:47 2016
@@ -33,7 +33,6 @@
 ;                 (optional)
 extra_flags =
   { "name", "helptxt"
-    _("ParadropFrom"), _("Units can paradrop from this tile.")
     _("DiplomatDefense"), _("Diplomatic units get a 25% defense bonus in 
diplomatic fights.")
   }
 
@@ -1071,10 +1070,12 @@
 build_time     = 3
 removal_time   = 0
 native_to      = "Air", "Helicopter", "Missile"
-flags          = "Refuel", "ParadropFrom", "NoStackDeath"
+flags          = "Refuel", "NoStackDeath"
 helptext       = _("\
 Airbases allow your air units to land and refuel. Air units in an \
 airbase may be attacked by land units.\
+"), _("\
+Units can paradrop from this tile.
 ")
 
 [extra_road]

Modified: trunk/data/classic/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/game.ruleset?rev=34281&r1=34280&r2=34281&view=diff
==============================================================================
--- trunk/data/classic/game.ruleset     (original)
+++ trunk/data/classic/game.ruleset     Fri Oct 28 20:29:47 2016
@@ -634,7 +634,7 @@
     { "type",      "name",         "range", "present"
       "UnitFlag",  "Paratroopers", "Local", TRUE
       "UnitState", "Transporting", "Local", FALSE
-      "ExtraFlag", "ParadropFrom", "Local", TRUE
+      "Extra",     "Airbase",      "Local", TRUE
     }
 
 [actionenabler_paradrop_city]

Modified: trunk/data/classic/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/terrain.ruleset?rev=34281&r1=34280&r2=34281&view=diff
==============================================================================
--- trunk/data/classic/terrain.ruleset  (original)
+++ trunk/data/classic/terrain.ruleset  Fri Oct 28 20:29:47 2016
@@ -35,7 +35,6 @@
 ;                 (optional)
 extra_flags =
   { "name", "helptxt"
-    _("ParadropFrom"), _("Units can paradrop from this tile.")
     _("DiplomatDefense"), _("Diplomatic units get a 25% defense bonus in 
diplomatic fights.")
   }
 
@@ -1297,10 +1296,12 @@
 build_time     = 3
 removal_time   = 0
 native_to      = "Air", "Helicopter", "Missile"
-flags          = "Refuel", "ParadropFrom", "NoStackDeath"
+flags          = "Refuel", "NoStackDeath"
 helptext       = _("\
 Airbases allow your air units to land and refuel. Air units in an \
 airbase may be attacked by land units.\
+"), _("\
+Units can paradrop from this tile.
 ")
 
 [extra_buoy]

Modified: trunk/data/experimental/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/game.ruleset?rev=34281&r1=34280&r2=34281&view=diff
==============================================================================
--- trunk/data/experimental/game.ruleset        (original)
+++ trunk/data/experimental/game.ruleset        Fri Oct 28 20:29:47 2016
@@ -650,7 +650,7 @@
     { "type",      "name",         "range", "present"
       "UnitFlag",  "Paratroopers", "Local", TRUE
       "UnitState", "Transporting", "Local", FALSE
-      "ExtraFlag", "ParadropFrom", "Local", TRUE
+      "Extra",     "Airbase",      "Local", TRUE
     }
 
 [actionenabler_paradrop_city]

Modified: trunk/data/experimental/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/terrain.ruleset?rev=34281&r1=34280&r2=34281&view=diff
==============================================================================
--- trunk/data/experimental/terrain.ruleset     (original)
+++ trunk/data/experimental/terrain.ruleset     Fri Oct 28 20:29:47 2016
@@ -37,7 +37,6 @@
 ;                 (optional)
 extra_flags =
   { "name", "helptxt"
-    _("ParadropFrom"), _("Units can paradrop from this tile.")
     _("DiplomatDefense"), _("Diplomatic units get a 25% defense bonus in 
diplomatic fights.")
   }
 
@@ -1273,10 +1272,12 @@
 build_time     = 3
 removal_time   = 0
 native_to      = "Air", "Helicopter", "Missile"
-flags          = "Refuel", "ParadropFrom", "NoStackDeath"
+flags          = "Refuel", "NoStackDeath"
 helptext       = _("\
 Airbases allow your air units to land and refuel. Air units in an \
 airbase may be attacked by land units.\
+"), _("\
+Units can paradrop from this tile.
 ")
 
 [extra_buoy]

Modified: trunk/data/multiplayer/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/game.ruleset?rev=34281&r1=34280&r2=34281&view=diff
==============================================================================
--- trunk/data/multiplayer/game.ruleset (original)
+++ trunk/data/multiplayer/game.ruleset Fri Oct 28 20:29:47 2016
@@ -617,7 +617,7 @@
     { "type",      "name",         "range", "present"
       "UnitFlag",  "Paratroopers", "Local", TRUE
       "UnitState", "Transporting", "Local", FALSE
-      "ExtraFlag", "ParadropFrom", "Local", TRUE
+      "Extra",     "Airbase",      "Local", TRUE
     }
 
 [actionenabler_paradrop_city]

Modified: trunk/data/multiplayer/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/terrain.ruleset?rev=34281&r1=34280&r2=34281&view=diff
==============================================================================
--- trunk/data/multiplayer/terrain.ruleset      (original)
+++ trunk/data/multiplayer/terrain.ruleset      Fri Oct 28 20:29:47 2016
@@ -35,7 +35,6 @@
 ;                 (optional)
 extra_flags =
   { "name", "helptxt"
-    _("ParadropFrom"), _("Units can paradrop from this tile.")
     _("DiplomatDefense"), _("Diplomatic units get a 25% defense bonus in 
diplomatic fights.")
   }
 
@@ -1271,10 +1270,12 @@
 build_time     = 3
 removal_time   = 0
 native_to      = "Air", "Helicopter", "Missile"
-flags          = "Refuel", "ParadropFrom", "NoStackDeath"
+flags          = "Refuel", "NoStackDeath"
 helptext       = _("\
 Airbases allow your air units to land and refuel. Air units in an \
 airbase may be attacked by land units.\
+"), _("\
+Units can paradrop from this tile.
 ")
 
 [extra_buoy]

Modified: trunk/data/webperimental/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/webperimental/game.ruleset?rev=34281&r1=34280&r2=34281&view=diff
==============================================================================
--- trunk/data/webperimental/game.ruleset       (original)
+++ trunk/data/webperimental/game.ruleset       Fri Oct 28 20:29:47 2016
@@ -834,7 +834,7 @@
     { "type",      "name",         "range", "present"
       "UnitFlag",  "Paratroopers", "Local", TRUE
       "UnitState", "Transporting", "Local", FALSE
-      "ExtraFlag", "ParadropFrom", "Local", TRUE
+      "Extra",     "Airbase",      "Local", TRUE
     }
 
 [actionenabler_paradrop_city]

Modified: trunk/data/webperimental/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/webperimental/terrain.ruleset?rev=34281&r1=34280&r2=34281&view=diff
==============================================================================
--- trunk/data/webperimental/terrain.ruleset    (original)
+++ trunk/data/webperimental/terrain.ruleset    Fri Oct 28 20:29:47 2016
@@ -35,7 +35,6 @@
 ;                 (optional)
 extra_flags =
   { "name", "helptxt"
-    _("ParadropFrom"), _("Units can paradrop from this tile.")
     _("DiplomatDefense"), _("Diplomatic units get a 25% defense bonus in 
diplomatic fights.")
   }
 
@@ -1297,10 +1296,12 @@
 build_time     = 3
 removal_time   = 0
 native_to      = "Air", "Helicopter", "Missile"
-flags          = "Refuel", "ParadropFrom", "NoStackDeath"
+flags          = "Refuel", "NoStackDeath"
 helptext       = _("\
 Airbases allow your air units to land and refuel. Air units in an \
 airbase may be attacked by land units.\
+"), _("\
+Units can paradrop from this tile.
 ")
 
 [extra_buoy]


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

Reply via email to