Author: sveinung
Date: Tue Mar  8 15:09:31 2016
New Revision: 32202

URL: http://svn.gna.org/viewcvs/freeciv?rev=32202&view=rev
Log:
sandbox: airlifting develops with technology.

Divide the unit types into light, medium and heavy weight units. Light
weight units can be airlifted once Flight is known. Medium weight units can
be airlifted once Advanced Flight is known. Heavy weight units can be
airlifted once Fusion Power is known. To airlift heavy and medium weight
units an airport is required both in the source and in the destination city.

Cities that know Flight can airlift one (light weight) unit per turn. An
Airport allows a city to airlift one more unit per turn.

See patch #7045

Modified:
    trunk/data/sandbox/buildings.ruleset
    trunk/data/sandbox/effects.ruleset
    trunk/data/sandbox/game.ruleset
    trunk/data/sandbox/techs.ruleset
    trunk/data/sandbox/units.ruleset

Modified: trunk/data/sandbox/buildings.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/buildings.ruleset?rev=32202&r1=32201&r2=32202&view=diff
==============================================================================
--- trunk/data/sandbox/buildings.ruleset        (original)
+++ trunk/data/sandbox/buildings.ruleset        Tue Mar  8 15:09:31 2016
@@ -77,16 +77,19 @@
 sabotage       = 100
 sound          = "b_airport"
 sound_alt      = "b_generic"
-helptext       = _("\
+helptext       =  _("\
 Allows a city to produce veteran air units (including helicopters). \
  Also, damaged air units (again, including helicopters) which stay in\
  town for one full turn without moving are completely restored.\
 "), _("\
-Two cities with Airports can airlift one unit per turn (including\
- aircraft). Airlifting instantly transports the unit from one city\
+A city with an Airport can airlift an extra unit per turn. Airlifting \
+ instantly transports the unit from one city\
  to another and will use all of the unit's movement points. A unit\
  must have some movement points left to be airlifted, and cannot\
  carry cargo.\
+"), _("\
+Two cities with Airports can airlift medium and heavy weight units once\
+ Advanced Flight and Fusion Power are discovered.\
 ")
 
 [building_aqueduct]

Modified: trunk/data/sandbox/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/effects.ruleset?rev=32202&r1=32201&r2=32202&view=diff
==============================================================================
--- trunk/data/sandbox/effects.ruleset  (original)
+++ trunk/data/sandbox/effects.ruleset  Tue Mar  8 15:09:31 2016
@@ -1725,6 +1725,14 @@
       "Building", "Airport", "City"
     }
 
+[effect_airlift_basic]
+type    = "Airlift"
+value   = 1
+reqs    =
+    { "type", "name",   "range"
+      "Tech", "Flight", "Player"
+    }
+
 ; Base max city size of 8
 [effect_aqueduct_base]
 type    = "Size_Adj"

Modified: trunk/data/sandbox/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/game.ruleset?rev=32202&r1=32201&r2=32202&view=diff
==============================================================================
--- trunk/data/sandbox/game.ruleset     (original)
+++ trunk/data/sandbox/game.ruleset     Tue Mar  8 15:09:31 2016
@@ -625,11 +625,37 @@
 [actionenabler_upgrade_unit]
 action = "Upgrade Unit"
 
-[actionenabler_airlift_unit]
+[actionenabler_airlift_light_unit]
 action = "Airlift Unit"
 actor_reqs    =
     { "type",          "name",        "range"
-      "UnitClassFlag", "Airliftable", "Local"
+      "UnitClassFlag", "LightWeight", "Local"
+    }
+
+[actionenabler_airlift_medium_unit]
+action = "Airlift Unit"
+actor_reqs    =
+    { "type",          "name",            "range"
+      "UnitClassFlag", "MediumWeight",    "Local"
+      "Tech",          "Advanced Flight", "Player"
+      "Building",      "Airport",         "City"
+    }
+target_reqs    =
+    { "type",     "name",    "range"
+      "Building", "Airport", "City"
+    }
+
+[actionenabler_airlift_heavy_unit]
+action = "Airlift Unit"
+actor_reqs    =
+    { "type",          "name",         "range"
+      "UnitClassFlag", "HeavyWeight",  "Local"
+      "Tech",          "Fusion Power", "Player"
+      "Building",      "Airport",       "City"
+    }
+target_reqs    =
+    { "type",     "name",    "range"
+      "Building", "Airport", "City"
     }
 
 [borders]

Modified: trunk/data/sandbox/techs.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/techs.ruleset?rev=32202&r1=32201&r2=32202&view=diff
==============================================================================
--- trunk/data/sandbox/techs.ruleset    (original)
+++ trunk/data/sandbox/techs.ruleset    Tue Mar  8 15:09:31 2016
@@ -88,7 +88,8 @@
 flags    = ""
 graphic     = "a.advanced_flight"
 graphic_alt = "-"
-helptext = _("Enables movement of nuclear units.")
+helptext = _("Enables movement of nuclear units."),
+           _("Enables airlift of medium weight units.")
 cost     = 570
 
 [advance_alphabet]
@@ -363,6 +364,7 @@
 flags    = "Build_Airborne"
 graphic     = "a.flight"
 graphic_alt = "-"
+helptext = _("Enables airlift of light weight units.")
 cost     = 500
 
 [advance_fusion_power]
@@ -372,7 +374,8 @@
 flags    = ""
 graphic     = "a.fusion_power"
 graphic_alt = "-"
-helptext = _("Makes it possible for Engineers to transform terrains.")
+helptext = _("Makes it possible for Engineers to transform terrains."),
+           _("Enables airlift of heavy weight units.")
 cost     = 770
 
 [advance_genetic_engineering]

Modified: trunk/data/sandbox/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/units.ruleset?rev=32202&r1=32201&r2=32202&view=diff
==============================================================================
--- trunk/data/sandbox/units.ruleset    (original)
+++ trunk/data/sandbox/units.ruleset    Tue Mar  8 15:09:31 2016
@@ -53,7 +53,9 @@
 ;                 with this flag (optional)
 class_flags =
   { "name", "helptxt"
-    _("Airliftable"), _("Can be airlifted from a suitable city.")
+    _("LightWeight"), _("Airliftable once you learn Flight.")
+    _("MediumWeight"), _("Airliftable from Airport after you learn Advanced 
Flight.")
+    _("HeavyWeight"), _("Airliftable from Airport after you learn Fusion 
Power.")
   }
 
 [veteran_system]
@@ -147,7 +149,7 @@
 min_speed     = 0
 hp_loss_pct   = 0
 hut_behavior  = "Frighten"
-flags         = "Missile", "Unreachable", "DoesntOccupyTile", "Airliftable"
+flags         = "Missile", "Unreachable", "DoesntOccupyTile", "MediumWeight"
 
 [unitclass_land]
 ; /* TRANS: Unit class: used adjectivally */
@@ -156,7 +158,7 @@
 hp_loss_pct   = 0
 flags         = "TerrainSpeed", "DamageSlows", "CanOccupyCity", 
"BuildAnywhere",
                 "CollectRansom", "ZOC", "CanFortify", "CanPillage",
-                "TerrainDefense", "KillCitizen", "Airliftable"
+                "TerrainDefense", "KillCitizen", "LightWeight"
 
 [unitclass_land_small]
 ; /* TRANS: Unit class: used adjectivally */
@@ -164,7 +166,7 @@
 min_speed     = 1
 hp_loss_pct   = 0
 flags         = "TerrainSpeed", "DamageSlows", "BuildAnywhere", 
"CollectRansom",
-                "ZOC", "TerrainDefense", "DoesntOccupyTile", "Airliftable"
+                "ZOC", "TerrainDefense", "DoesntOccupyTile", "LightWeight"
 
 [unitclass_land_big]
 ; /* TRANS: Unit class: used adjectivally */
@@ -172,7 +174,7 @@
 min_speed     = 1
 hp_loss_pct   = 0
 flags         = "TerrainSpeed", "DamageSlows", "CanOccupyCity", 
"BuildAnywhere",
-                "CollectRansom","ZOC", "CanFortify", "KillCitizen", 
"Airliftable"
+                "CollectRansom","ZOC", "CanFortify", "KillCitizen", 
"MediumWeight"
 
 [unitclass_merchant]
 ; /* TRANS: Unit class: used adjectivally */
@@ -180,28 +182,29 @@
 min_speed     = 1
 hp_loss_pct   = 0
 flags         = "BuildAnywhere", "DoesntOccupyTile",
-                "TerrainDefense", "TerrainSpeed", "Airliftable"
+                "TerrainDefense", "TerrainSpeed", "MediumWeight"
 
 [unitclass_sea]
 ; /* TRANS: Unit class: used adjectivally */
 name          = _("?unitclass:Sea")
 min_speed     = 2
 hp_loss_pct   = 0
-flags         = "ZOC", "DamageSlows", "AttackNonNative", "AttFromNonNative"
+flags         = "ZOC", "DamageSlows", "AttackNonNative", "AttFromNonNative",
+                "HeavyWeight"
 
 [unitclass_trireme]
 ; /* TRANS: Unit class: used adjectivally */
 name          = _("?unitclass:Trireme")
 min_speed     = 2
 hp_loss_pct   = 0
-flags         = "ZOC", "DamageSlows", "AttFromNonNative"
+flags         = "ZOC", "DamageSlows", "AttFromNonNative", "MediumWeight"
 
 [unitclass_heli]
 ; /* TRANS: Unit class: used adjectivally */
 name          = _("?unitclass:Helicopter")
 min_speed     = 1
 hp_loss_pct   = 10
-flags         = "Unreachable", "DoesntOccupyTile", "CanOccupyCity", 
"CollectRansom", "Airliftable"
+flags         = "Unreachable", "DoesntOccupyTile", "CanOccupyCity", 
"CollectRansom", "MediumWeight"
 
 [unitclass_air]
 ; /* TRANS: Unit class: used adjectivally */
@@ -209,7 +212,7 @@
 min_speed     = 1
 hp_loss_pct   = 10
 hut_behavior  = "Frighten"
-flags         = "Unreachable", "DoesntOccupyTile", "CanPillage", "Airliftable"
+flags         = "Unreachable", "DoesntOccupyTile", "CanPillage", "MediumWeight"
 
 ; /* <-- avoid gettext warnings
 ;


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

Reply via email to