Author: jtn
Date: Thu Mar 12 01:07:27 2015
New Revision: 28495

URL: http://svn.gna.org/viewcvs/freeciv?rev=28495&view=rev
Log:
Tweak civ2civ3 airbase cumulative HP_Regen to 1/3, to match a city
without an Airport.

Suggested by David Fernandez (bardo@gna).

See gna patch #5925.

Modified:
    trunk/data/civ2civ3/effects.ruleset

Modified: trunk/data/civ2civ3/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/effects.ruleset?rev=28495&r1=28494&r2=28495&view=diff
==============================================================================
--- trunk/data/civ2civ3/effects.ruleset (original)
+++ trunk/data/civ2civ3/effects.ruleset Thu Mar 12 01:07:27 2015
@@ -265,6 +265,25 @@
       "UnitClass", "Missile", "Local", FALSE
     }
 
+[effect_fort_defense]
+type    = "Defend_Bonus"
+value   = 50
+reqs    =
+    { "type", "name", "range", "present"
+      "Extra", "Fort", "Local", TRUE
+;      "UnitClass", "Land", "Local", FALSE
+;      "UnitClass", "Small Land", "Local", FALSE
+;      "UnitClass", "Big Land", "Local", FALSE
+;      "UnitClass", "Merchant", "Local", FALSE
+;      "UnitClass", "Sea", "Local", FALSE
+;      "UnitClass", "Trireme", "Local", FALSE
+      "UnitClass", "Helicopter", "Local", FALSE
+      "UnitClass", "Air", "Local", FALSE
+      "UnitClass", "Missile", "Local", FALSE
+    }
+
+; Cumulative with fort
+; 50 + 50 = 100
 [effect_fortress_defense]
 type    = "Defend_Bonus"
 value   = 50
@@ -282,27 +301,30 @@
       "UnitClass", "Missile", "Local", FALSE
     }
 
-[effect_fort_defense]
-type    = "Defend_Bonus"
-value   = 50
-reqs    =
-    { "type", "name", "range", "present"
-      "Extra", "Fort", "Local", TRUE
-;      "UnitClass", "Land", "Local", FALSE
-;      "UnitClass", "Small Land", "Local", FALSE
-;      "UnitClass", "Big Land", "Local", FALSE
-;      "UnitClass", "Merchant", "Local", FALSE
-;      "UnitClass", "Sea", "Local", FALSE
-;      "UnitClass", "Trireme", "Local", FALSE
-      "UnitClass", "Helicopter", "Local", FALSE
-      "UnitClass", "Air", "Local", FALSE
+; Airstrip HP regen (Every Air unit)
+[effect_airstrip_hp_regen]
+type    = "HP_Regen"
+value   = 10
+reqs    =
+    { "type", "name", "range", "present"
+      "Extra", "Airstrip", "Local", TRUE
+      "UnitClass", "Land", "Local", FALSE
+      "UnitClass", "Small Land", "Local", FALSE
+      "UnitClass", "Big Land", "Local", FALSE
+      "UnitClass", "Merchant", "Local", FALSE
+      "UnitClass", "Sea", "Local", FALSE
+      "UnitClass", "Trireme", "Local", FALSE
+;      "UnitClass", "Helicopter", "Local", FALSE
+;      "UnitClass", "Air", "Local", FALSE
       "UnitClass", "Missile", "Local", FALSE
     }
 
-; Airbase HP regen (Every Air units)
+; Airbase HP regen: cumulative with airstrip
+; 10 + 24 = 34% (this approximation to 1/3 is exact for units <50HP;
+; 1/3 is equivalent to a city without Airport)
 [effect_airbase_hp_regen]
 type    = "HP_Regen"
-value   = 25
+value   = 24
 reqs    =
     { "type", "name", "range", "present"
       "Extra", "Airbase", "Local", TRUE
@@ -317,9 +339,9 @@
       "UnitClass", "Missile", "Local", FALSE
     }
 
-[effect_airfield_hp_regen]
-type    = "HP_Regen"
-value   = 10
+[effect_airstrip_defense]
+type    = "Defend_Bonus"
+value   = 50
 reqs    =
     { "type", "name", "range", "present"
       "Extra", "Airstrip", "Local", TRUE
@@ -331,32 +353,17 @@
       "UnitClass", "Trireme", "Local", FALSE
 ;      "UnitClass", "Helicopter", "Local", FALSE
 ;      "UnitClass", "Air", "Local", FALSE
-      "UnitClass", "Missile", "Local", FALSE
-    }
-
+;      "UnitClass", "Missile", "Local", FALSE
+    }
+
+; Cumulative with airstrip
+; 50 + 50 = 100
 [effect_airbase_defense]
 type    = "Defend_Bonus"
 value   = 50
 reqs    =
     { "type", "name", "range", "present"
       "Extra", "Airbase", "Local", TRUE
-      "UnitClass", "Land", "Local", FALSE
-      "UnitClass", "Small Land", "Local", FALSE
-      "UnitClass", "Big Land", "Local", FALSE
-      "UnitClass", "Merchant", "Local", FALSE
-      "UnitClass", "Sea", "Local", FALSE
-      "UnitClass", "Trireme", "Local", FALSE
-;      "UnitClass", "Helicopter", "Local", FALSE
-;      "UnitClass", "Air", "Local", FALSE
-;      "UnitClass", "Missile", "Local", FALSE
-    }
-
-[effect_airfield_defense]
-type    = "Defend_Bonus"
-value   = 50
-reqs    =
-    { "type", "name", "range", "present"
-      "Extra", "Airstrip", "Local", TRUE
       "UnitClass", "Land", "Local", FALSE
       "UnitClass", "Small Land", "Local", FALSE
       "UnitClass", "Big Land", "Local", FALSE


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

Reply via email to