Author: cazfi
Date: Thu Nov  3 14:23:32 2016
New Revision: 34356

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

See patch #7919

Modified:
    trunk/data/civ1/effects.ruleset
    trunk/data/civ1/terrain.ruleset
    trunk/data/civ2/effects.ruleset
    trunk/data/civ2/terrain.ruleset
    trunk/data/classic/effects.ruleset
    trunk/data/classic/terrain.ruleset
    trunk/data/experimental/effects.ruleset
    trunk/data/experimental/terrain.ruleset
    trunk/data/multiplayer/effects.ruleset
    trunk/data/multiplayer/terrain.ruleset
    trunk/data/webperimental/effects.ruleset
    trunk/data/webperimental/terrain.ruleset

Modified: trunk/data/civ1/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/effects.ruleset?rev=34356&r1=34355&r2=34356&view=diff
==============================================================================
--- trunk/data/civ1/effects.ruleset     (original)
+++ trunk/data/civ1/effects.ruleset     Thu Nov  3 14:23:32 2016
@@ -1436,12 +1436,12 @@
       "Extra", "Pollution", "Local"
     }
 
-[effect_diplomat_defense_extra]
+[effect_diplomat_defense_fortress]
 type    = "Spy_Resistant"
-value  = 25
-reqs   =
-    { "type",      "name",            "range"
-      "ExtraFlag", "DiplomatDefense", "Local"
+value   = 25
+reqs    =
+    { "type",  "name",     "range"
+      "Extra", "Fortress", "Local"
     }
 
 [effect_incite_cost_empty]

Modified: trunk/data/civ1/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/terrain.ruleset?rev=34356&r1=34355&r2=34356&view=diff
==============================================================================
--- trunk/data/civ1/terrain.ruleset     (original)
+++ trunk/data/civ1/terrain.ruleset     Thu Nov  3 14:23:32 2016
@@ -31,10 +31,9 @@
 ;                 and sensible.
 ; helptxt       = displayed in the help for extra types with this flag
 ;                 (optional)
-extra_flags =
-  { "name", "helptxt"
-    _("DiplomatDefense"), _("Diplomatic units get a 25% defense bonus in 
diplomatic fights.")
-  }
+;extra_flags =
+;  { "name", "helptxt"
+;  }
 
 [parameters]
 
@@ -947,9 +946,11 @@
 removal_time   = 0
 defense_bonus  = 100
 native_to      = "Land"
-flags          = "DiplomatDefense", "NoStackDeath"
+flags          = "NoStackDeath"
 helptext       = _("\
 Fortresses improve defense for land units.\
+"), _("\
+Diplomatic units get a 25% defense bonus in diplomatic fights.\
 ")
 
 [extra_road]

Modified: trunk/data/civ2/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/effects.ruleset?rev=34356&r1=34355&r2=34356&view=diff
==============================================================================
--- trunk/data/civ2/effects.ruleset     (original)
+++ trunk/data/civ2/effects.ruleset     Thu Nov  3 14:23:32 2016
@@ -1174,12 +1174,12 @@
       "Building", "Courthouse", "City", TRUE
     }
 
-[effect_diplomat_defense_extra]
+[effect_diplomat_defense_fortress]
 type    = "Spy_Resistant"
-value  = 25
-reqs   =
-    { "type",      "name",            "range"
-      "ExtraFlag", "DiplomatDefense", "Local"
+value   = 25
+reqs    =
+    { "type",  "name",     "range"
+      "Extra", "Fortress", "Local"
     }
 
 [effect_incite_cost_empty]

Modified: trunk/data/civ2/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/terrain.ruleset?rev=34356&r1=34355&r2=34356&view=diff
==============================================================================
--- trunk/data/civ2/terrain.ruleset     (original)
+++ trunk/data/civ2/terrain.ruleset     Thu Nov  3 14:23:32 2016
@@ -31,10 +31,9 @@
 ;                 and sensible.
 ; helptxt       = displayed in the help for extra types with this flag
 ;                 (optional)
-extra_flags =
-  { "name", "helptxt"
-    _("DiplomatDefense"), _("Diplomatic units get a 25% defense bonus in 
diplomatic fights.")
-  }
+;extra_flags =
+;  { "name", "helptxt"
+;  }
 
 [parameters]
 
@@ -1041,11 +1040,13 @@
 removal_time   = 0
 defense_bonus  = 100
 native_to      = "Land"
-flags          = "DiplomatDefense", "NoStackDeath"
+flags          = "NoStackDeath"
 helptext       = _("\
 Fortresses improve defense for land units. Among other effects, a land \
 unit remaining in a fortress for a whole turn without moving recovers \
 a quarter of its hit points.\
+"), _("\
+Diplomatic units get a 25% defense bonus in diplomatic fights.\
 ")
 
 [extra_airbase]

Modified: trunk/data/classic/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/effects.ruleset?rev=34356&r1=34355&r2=34356&view=diff
==============================================================================
--- trunk/data/classic/effects.ruleset  (original)
+++ trunk/data/classic/effects.ruleset  Thu Nov  3 14:23:32 2016
@@ -1024,12 +1024,12 @@
       "Building", "Courthouse", "City", TRUE
     }
 
-[effect_diplomat_defense_extra]
+[effect_diplomat_defense_fortress]
 type    = "Spy_Resistant"
-value  = 25
-reqs   =
-    { "type",      "name",            "range"
-      "ExtraFlag", "DiplomatDefense", "Local"
+value   = 25
+reqs    =
+    { "type",  "name",     "range"
+      "Extra", "Fortress", "Local"
     }
 
 [effect_incite_cost_empty]

Modified: trunk/data/classic/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/terrain.ruleset?rev=34356&r1=34355&r2=34356&view=diff
==============================================================================
--- trunk/data/classic/terrain.ruleset  (original)
+++ trunk/data/classic/terrain.ruleset  Thu Nov  3 14:23:32 2016
@@ -33,10 +33,9 @@
 ;                 and sensible.
 ; helptxt       = displayed in the help for extra types with this flag
 ;                 (optional)
-extra_flags =
-  { "name", "helptxt"
-    _("DiplomatDefense"), _("Diplomatic units get a 25% defense bonus in 
diplomatic fights.")
-  }
+;extra_flags =
+;  { "name", "helptxt"
+;  }
 
 [parameters]
 
@@ -1266,12 +1265,14 @@
 removal_time   = 0
 defense_bonus  = 100
 native_to      = "Land"
-flags          = "DiplomatDefense", "NoStackDeath"
+flags          = "NoStackDeath"
 helptext       = _("\
 Fortresses improve defense for land units. Among other effects, a land \
 unit remaining in a fortress for a whole turn without moving recovers \
 a quarter of its hit points. With Invention, fortresses gain watchtowers \
 from which land units can see further afield.\
+"), _("\
+Diplomatic units get a 25% defense bonus in diplomatic fights.\
 ")
 
 [extra_airbase]

Modified: trunk/data/experimental/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/effects.ruleset?rev=34356&r1=34355&r2=34356&view=diff
==============================================================================
--- trunk/data/experimental/effects.ruleset     (original)
+++ trunk/data/experimental/effects.ruleset     Thu Nov  3 14:23:32 2016
@@ -1202,12 +1202,12 @@
       "Building", "Courthouse", "City", TRUE
     }
 
-[effect_diplomat_defense_extra]
+[effect_diplomat_defense_fortress]
 type    = "Spy_Resistant"
-value  = 25
-reqs   =
-    { "type",      "name",            "range"
-      "ExtraFlag", "DiplomatDefense", "Local"
+value   = 25
+reqs    =
+    { "type",  "name",     "range"
+      "Extra", "Fortress", "Local"
     }
 
 [effect_incite_cost_empty]

Modified: trunk/data/experimental/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/terrain.ruleset?rev=34356&r1=34355&r2=34356&view=diff
==============================================================================
--- trunk/data/experimental/terrain.ruleset     (original)
+++ trunk/data/experimental/terrain.ruleset     Thu Nov  3 14:23:32 2016
@@ -35,10 +35,9 @@
 ;                 and sensible.
 ; helptxt       = displayed in the help for extra types with this flag
 ;                 (optional)
-extra_flags =
-  { "name", "helptxt"
-    _("DiplomatDefense"), _("Diplomatic units get a 25% defense bonus in 
diplomatic fights.")
-  }
+;extra_flags =
+;  { "name", "helptxt"
+;  }
 
 [parameters]
 
@@ -1242,12 +1241,14 @@
 removal_time   = 0
 defense_bonus  = 100
 native_to      = "Land", "Big Land"
-flags          = "DiplomatDefense", "NoStackDeath"
+flags          = "NoStackDeath"
 helptext       = _("\
 Fortresses improve defense for land units. Among other effects, a land \
 unit remaining in a fortress for a whole turn without moving recovers \
 a quarter of its hit points. With Invention, fortresses gain watchtowers \
 from which land units can see further afield.\
+"), _("\
+Diplomatic units get a 25% defense bonus in diplomatic fights.\
 ")
 
 [extra_airbase]

Modified: trunk/data/multiplayer/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/effects.ruleset?rev=34356&r1=34355&r2=34356&view=diff
==============================================================================
--- trunk/data/multiplayer/effects.ruleset      (original)
+++ trunk/data/multiplayer/effects.ruleset      Thu Nov  3 14:23:32 2016
@@ -1030,12 +1030,12 @@
       "Building", "Courthouse", "City", TRUE
     }
 
-[effect_diplomat_defense_extra]
+[effect_diplomat_defense_fortress]
 type    = "Spy_Resistant"
-value  = 25
-reqs   =
-    { "type",      "name",            "range"
-      "ExtraFlag", "DiplomatDefense", "Local"
+value   = 25
+reqs    =
+    { "type",  "name",     "range"
+      "Extra", "Fortress", "Local"
     }
 
 [effect_incite_cost_empty]

Modified: trunk/data/multiplayer/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/terrain.ruleset?rev=34356&r1=34355&r2=34356&view=diff
==============================================================================
--- trunk/data/multiplayer/terrain.ruleset      (original)
+++ trunk/data/multiplayer/terrain.ruleset      Thu Nov  3 14:23:32 2016
@@ -33,10 +33,9 @@
 ;                 and sensible.
 ; helptxt       = displayed in the help for extra types with this flag
 ;                 (optional)
-extra_flags =
-  { "name", "helptxt"
-    _("DiplomatDefense"), _("Diplomatic units get a 25% defense bonus in 
diplomatic fights.")
-  }
+;extra_flags =
+;  { "name", "helptxt"
+;  }
 
 [parameters]
 
@@ -1240,12 +1239,14 @@
 removal_time   = 0
 defense_bonus  = 100
 native_to      = "Land"
-flags          = "DiplomatDefense", "NoStackDeath"
+flags          = "NoStackDeath"
 helptext       = _("\
 Fortresses improve defense for land units. Among other effects, a land \
 unit remaining in a fortress for a whole turn without moving recovers \
 a quarter of its hit points. With Invention, fortresses gain watchtowers \
 from which land units can see further afield.\
+"), _("\
+Diplomatic units get a 25% defense bonus in diplomatic fights.\
 ")
 
 [extra_airbase]

Modified: trunk/data/webperimental/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/webperimental/effects.ruleset?rev=34356&r1=34355&r2=34356&view=diff
==============================================================================
--- trunk/data/webperimental/effects.ruleset    (original)
+++ trunk/data/webperimental/effects.ruleset    Thu Nov  3 14:23:32 2016
@@ -1032,12 +1032,12 @@
       "Building", "Courthouse", "City", TRUE
     }
 
-[effect_diplomat_defense_extra]
+[effect_diplomat_defense_fortress]
 type    = "Spy_Resistant"
-value  = 25
-reqs   =
-    { "type",      "name",            "range"
-      "ExtraFlag", "DiplomatDefense", "Local"
+value   = 25
+reqs    =
+    { "type",  "name",     "range"
+      "Extra", "Fortress", "Local"
     }
 
 [effect_incite_cost_empty]

Modified: trunk/data/webperimental/terrain.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/webperimental/terrain.ruleset?rev=34356&r1=34355&r2=34356&view=diff
==============================================================================
--- trunk/data/webperimental/terrain.ruleset    (original)
+++ trunk/data/webperimental/terrain.ruleset    Thu Nov  3 14:23:32 2016
@@ -33,10 +33,9 @@
 ;                 and sensible.
 ; helptxt       = displayed in the help for extra types with this flag
 ;                 (optional)
-extra_flags =
-  { "name", "helptxt"
-    _("DiplomatDefense"), _("Diplomatic units get a 25% defense bonus in 
diplomatic fights.")
-  }
+;extra_flags =
+;  { "name", "helptxt"
+;  }
 
 [parameters]
 
@@ -1266,12 +1265,14 @@
 removal_time   = 0
 defense_bonus  = 100
 native_to      = "Land"
-flags          = "DiplomatDefense", "NoStackDeath"
+flags          = "NoStackDeath"
 helptext       = _("\
 Fortresses improve defense for land units. Among other effects, a land \
 unit remaining in a fortress for a whole turn without moving recovers \
 a quarter of its hit points. With Invention, fortresses gain watchtowers \
 from which land units can see further afield.\
+"), _("\
+Diplomatic units get a 25% defense bonus in diplomatic fights.\
 ")
 
 [extra_airbase]


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

Reply via email to