Author: jtn
Date: Mon Jun 2 23:28:45 2014
New Revision: 25026
URL: http://svn.gna.org/viewcvs/freeciv?rev=25026&view=rev
Log:
Tweak Barracks effect exclusions so that in the rare case older
buildings coexist with newer ones, the older ones are treated as
redundant in the UI.
See gna bug #22080.
Modified:
branches/S2_5/data/civ1/effects.ruleset
branches/S2_5/data/civ2/effects.ruleset
branches/S2_5/data/classic/effects.ruleset
branches/S2_5/data/experimental/effects.ruleset
branches/S2_5/data/multiplayer/effects.ruleset
Modified: branches/S2_5/data/civ1/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ1/effects.ruleset?rev=25026&r1=25025&r2=25026&view=diff
==============================================================================
--- branches/S2_5/data/civ1/effects.ruleset (original)
+++ branches/S2_5/data/civ1/effects.ruleset Mon Jun 2 23:28:45 2014
@@ -571,6 +571,11 @@
{ "type", "name", "range"
"Building", "Barracks", "City"
}
+nreqs =
+ { "type", "name", "range"
+ "Building", "Barracks II", "City"
+ "Building", "Barracks III", "City"
+ }
[effect_barracks_ii]
type = "Veteran_Build"
@@ -581,7 +586,7 @@
}
nreqs =
{ "type", "name", "range"
- "Building", "Barracks", "City"
+ "Building", "Barracks III", "City"
}
[effect_barracks_iii]
@@ -590,11 +595,6 @@
reqs =
{ "type", "name", "range"
"Building", "Barracks III", "City"
- }
-nreqs =
- { "type", "name", "range"
- "Building", "Barracks", "City"
- "Building", "Barracks II", "City"
}
[effect_cathedral]
Modified: branches/S2_5/data/civ2/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2/effects.ruleset?rev=25026&r1=25025&r2=25026&view=diff
==============================================================================
--- branches/S2_5/data/civ2/effects.ruleset (original)
+++ branches/S2_5/data/civ2/effects.ruleset Mon Jun 2 23:28:45 2014
@@ -939,6 +939,8 @@
{ "type", "name", "range"
"UnitFlag", "NonMil", "Local"
"UnitFlag", "NoVeteran", "Local"
+ "Building", "Barracks II", "City"
+ "Building", "Barracks III", "City"
}
[effect_barracks_1]
@@ -949,6 +951,11 @@
"Building", "Barracks", "City"
"UnitClass", "Land", "Local"
}
+nreqs =
+ { "type", "name", "range"
+ "Building", "Barracks II", "City"
+ "Building", "Barracks III", "City"
+ }
[effect_barracks_ii]
type = "Veteran_Build"
@@ -962,7 +969,7 @@
{ "type", "name", "range"
"UnitFlag", "NonMil", "Local"
"UnitFlag", "NoVeteran", "Local"
- "Building", "Barracks", "City"
+ "Building", "Barracks III", "City"
}
[effect_barracks_ii_1]
@@ -973,6 +980,10 @@
"Building", "Barracks II", "City"
"UnitClass", "Land", "Local"
}
+nreqs =
+ { "type", "name", "range"
+ "Building", "Barracks III", "City"
+ }
[effect_barracks_iii]
type = "Veteran_Build"
@@ -986,8 +997,6 @@
{ "type", "name", "range"
"UnitFlag", "NonMil", "Local"
"UnitFlag", "NoVeteran", "Local"
- "Building", "Barracks", "City"
- "Building", "Barracks II", "City"
}
[effect_barracks_iii_1]
Modified: branches/S2_5/data/classic/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/classic/effects.ruleset?rev=25026&r1=25025&r2=25026&view=diff
==============================================================================
--- branches/S2_5/data/classic/effects.ruleset (original)
+++ branches/S2_5/data/classic/effects.ruleset Mon Jun 2 23:28:45 2014
@@ -821,6 +821,8 @@
{ "type", "name", "range"
"UnitFlag", "NonMil", "Local"
"UnitFlag", "NoVeteran", "Local"
+ "Building", "Barracks II", "City"
+ "Building", "Barracks III", "City"
}
[effect_barracks_1]
@@ -831,6 +833,11 @@
"Building", "Barracks", "City"
"UnitClass", "Land", "Local"
}
+nreqs =
+ { "type", "name", "range"
+ "Building", "Barracks II", "City"
+ "Building", "Barracks III", "City"
+ }
[effect_barracks_ii]
type = "Veteran_Build"
@@ -844,7 +851,7 @@
{ "type", "name", "range"
"UnitFlag", "NonMil", "Local"
"UnitFlag", "NoVeteran", "Local"
- "Building", "Barracks", "City"
+ "Building", "Barracks III", "City"
}
[effect_barracks_ii_1]
@@ -855,6 +862,10 @@
"Building", "Barracks II", "City"
"UnitClass", "Land", "Local"
}
+nreqs =
+ { "type", "name", "range"
+ "Building", "Barracks III", "City"
+ }
[effect_barracks_iii]
type = "Veteran_Build"
@@ -868,8 +879,6 @@
{ "type", "name", "range"
"UnitFlag", "NonMil", "Local"
"UnitFlag", "NoVeteran", "Local"
- "Building", "Barracks", "City"
- "Building", "Barracks II", "City"
}
[effect_barracks_iii_1]
Modified: branches/S2_5/data/experimental/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/experimental/effects.ruleset?rev=25026&r1=25025&r2=25026&view=diff
==============================================================================
--- branches/S2_5/data/experimental/effects.ruleset (original)
+++ branches/S2_5/data/experimental/effects.ruleset Mon Jun 2 23:28:45 2014
@@ -898,6 +898,8 @@
{ "type", "name", "range"
"UnitFlag", "NonMil", "Local"
"UnitFlag", "NoVeteran", "Local"
+ "Building", "Barracks II", "City"
+ "Building", "Barracks III", "City"
}
[effect_barracks_bl]
@@ -912,6 +914,8 @@
{ "type", "name", "range"
"UnitFlag", "NonMil", "Local"
"UnitFlag", "NoVeteran", "Local"
+ "Building", "Barracks II", "City"
+ "Building", "Barracks III", "City"
}
[effect_barracks_1]
@@ -922,6 +926,11 @@
"Building", "Barracks", "City"
"UnitClass", "Land", "Local"
}
+nreqs =
+ { "type", "name", "range"
+ "Building", "Barracks II", "City"
+ "Building", "Barracks III", "City"
+ }
[effect_barracks_bl_1]
type = "HP_Regen"
@@ -931,6 +940,11 @@
"Building", "Barracks", "City"
"UnitClass", "Big Land", "Local"
}
+nreqs =
+ { "type", "name", "range"
+ "Building", "Barracks II", "City"
+ "Building", "Barracks III", "City"
+ }
[effect_barracks_ii]
type = "Veteran_Build"
@@ -944,7 +958,7 @@
{ "type", "name", "range"
"UnitFlag", "NonMil", "Local"
"UnitFlag", "NoVeteran", "Local"
- "Building", "Barracks", "City"
+ "Building", "Barracks III", "City"
}
[effect_barracks_ii_bl]
@@ -959,7 +973,7 @@
{ "type", "name", "range"
"UnitFlag", "NonMil", "Local"
"UnitFlag", "NoVeteran", "Local"
- "Building", "Barracks", "City"
+ "Building", "Barracks III", "City"
}
[effect_barracks_ii_1]
@@ -970,6 +984,10 @@
"Building", "Barracks II", "City"
"UnitClass", "Land", "Local"
}
+nreqs =
+ { "type", "name", "range"
+ "Building", "Barracks III", "City"
+ }
[effect_barracks_ii_bl_1]
type = "HP_Regen"
@@ -979,6 +997,10 @@
"Building", "Barracks II", "City"
"UnitClass", "Big Land", "Local"
}
+nreqs =
+ { "type", "name", "range"
+ "Building", "Barracks III", "City"
+ }
[effect_barracks_iii]
type = "Veteran_Build"
@@ -992,8 +1014,6 @@
{ "type", "name", "range"
"UnitFlag", "NonMil", "Local"
"UnitFlag", "NoVeteran", "Local"
- "Building", "Barracks", "City"
- "Building", "Barracks II", "City"
}
[effect_barracks_iii_bl]
@@ -1008,8 +1028,6 @@
{ "type", "name", "range"
"UnitFlag", "NonMil", "Local"
"UnitFlag", "NoVeteran", "Local"
- "Building", "Barracks", "City"
- "Building", "Barracks II", "City"
}
[effect_barracks_iii_1]
Modified: branches/S2_5/data/multiplayer/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/multiplayer/effects.ruleset?rev=25026&r1=25025&r2=25026&view=diff
==============================================================================
--- branches/S2_5/data/multiplayer/effects.ruleset (original)
+++ branches/S2_5/data/multiplayer/effects.ruleset Mon Jun 2 23:28:45 2014
@@ -830,6 +830,8 @@
{ "type", "name", "range"
"UnitFlag", "NonMil", "Local"
"UnitFlag", "NoVeteran", "Local"
+ "Building", "Barracks II", "City"
+ "Building", "Barracks III", "City"
}
[effect_barracks_1]
@@ -840,6 +842,11 @@
"Building", "Barracks", "City"
"UnitClass", "Land", "Local"
}
+nreqs =
+ { "type", "name", "range"
+ "Building", "Barracks II", "City"
+ "Building", "Barracks III", "City"
+ }
[effect_barracks_ii]
type = "Veteran_Build"
@@ -853,7 +860,7 @@
{ "type", "name", "range"
"UnitFlag", "NonMil", "Local"
"UnitFlag", "NoVeteran", "Local"
- "Building", "Barracks", "City"
+ "Building", "Barracks III", "City"
}
[effect_barracks_ii_1]
@@ -864,6 +871,10 @@
"Building", "Barracks II", "City"
"UnitClass", "Land", "Local"
}
+nreqs =
+ { "type", "name", "range"
+ "Building", "Barracks III", "City"
+ }
[effect_barracks_iii]
type = "Veteran_Build"
@@ -877,8 +888,6 @@
{ "type", "name", "range"
"UnitFlag", "NonMil", "Local"
"UnitFlag", "NoVeteran", "Local"
- "Building", "Barracks", "City"
- "Building", "Barracks II", "City"
}
[effect_barracks_iii_1]
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
