Author: jtn Date: Mon Jun 2 23:27:09 2014 New Revision: 25022 URL: http://svn.gna.org/viewcvs/freeciv?rev=25022&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: trunk/data/civ1/effects.ruleset trunk/data/civ2/effects.ruleset trunk/data/classic/effects.ruleset trunk/data/experimental/effects.ruleset trunk/data/multiplayer/effects.ruleset Modified: trunk/data/civ1/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/effects.ruleset?rev=25022&r1=25021&r2=25022&view=diff ============================================================================== --- trunk/data/civ1/effects.ruleset (original) +++ trunk/data/civ1/effects.ruleset Mon Jun 2 23:27:09 2014 @@ -552,8 +552,10 @@ type = "Veteran_Build" value = 1 reqs = - { "type", "name", "range" - "Building", "Barracks", "City" + { "type", "name", "range", "present" + "Building", "Barracks", "City", TRUE + "Building", "Barracks II", "City", FALSE + "Building", "Barracks III", "City", FALSE } [effect_barracks_ii] @@ -562,17 +564,15 @@ reqs = { "type", "name", "range", "present" "Building", "Barracks II", "City", TRUE - "Building", "Barracks", "City", FALSE + "Building", "Barracks III", "City", FALSE } [effect_barracks_iii] type = "Veteran_Build" value = 1 reqs = - { "type", "name", "range", "present" - "Building", "Barracks III", "City", TRUE - "Building", "Barracks", "City", FALSE - "Building", "Barracks II", "City", FALSE + { "type", "name", "range" + "Building", "Barracks III", "City" } [effect_cathedral] Modified: trunk/data/civ2/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/effects.ruleset?rev=25022&r1=25021&r2=25022&view=diff ============================================================================== --- trunk/data/civ2/effects.ruleset (original) +++ trunk/data/civ2/effects.ruleset Mon Jun 2 23:27:09 2014 @@ -911,15 +911,19 @@ "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE "UnitFlag", "NoVeteran", "Local", FALSE + "Building", "Barracks II", "City", FALSE + "Building", "Barracks III", "City", FALSE } [effect_barracks_1] type = "HP_Regen" value = 100 reqs = - { "type", "name", "range" - "Building", "Barracks", "City" - "UnitClass", "Land", "Local" + { "type", "name", "range", "present" + "Building", "Barracks", "City", TRUE + "UnitClass", "Land", "Local", TRUE + "Building", "Barracks II", "City", FALSE + "Building", "Barracks III", "City", FALSE } [effect_barracks_ii] @@ -931,16 +935,17 @@ "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE "UnitFlag", "NoVeteran", "Local", FALSE - "Building", "Barracks", "City", FALSE + "Building", "Barracks III", "City", FALSE } [effect_barracks_ii_1] type = "HP_Regen" value = 100 reqs = - { "type", "name", "range" - "Building", "Barracks II", "City" - "UnitClass", "Land", "Local" + { "type", "name", "range", "present" + "Building", "Barracks II", "City", TRUE + "UnitClass", "Land", "Local", TRUE + "Building", "Barracks III", "City", FALSE } [effect_barracks_iii] @@ -952,8 +957,6 @@ "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE "UnitFlag", "NoVeteran", "Local", FALSE - "Building", "Barracks", "City", FALSE - "Building", "Barracks II", "City", FALSE } [effect_barracks_iii_1] Modified: trunk/data/classic/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/effects.ruleset?rev=25022&r1=25021&r2=25022&view=diff ============================================================================== --- trunk/data/classic/effects.ruleset (original) +++ trunk/data/classic/effects.ruleset Mon Jun 2 23:27:09 2014 @@ -793,15 +793,19 @@ "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE "UnitFlag", "NoVeteran", "Local", FALSE + "Building", "Barracks II", "City", FALSE + "Building", "Barracks III", "City", FALSE } [effect_barracks_1] type = "HP_Regen" value = 100 reqs = - { "type", "name", "range" - "Building", "Barracks", "City" - "UnitClass", "Land", "Local" + { "type", "name", "range", "present" + "Building", "Barracks", "City", TRUE + "UnitClass", "Land", "Local", TRUE + "Building", "Barracks II", "City", FALSE + "Building", "Barracks III", "City", FALSE } [effect_barracks_ii] @@ -813,16 +817,17 @@ "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE "UnitFlag", "NoVeteran", "Local", FALSE - "Building", "Barracks", "City", FALSE + "Building", "Barracks III", "City", FALSE } [effect_barracks_ii_1] type = "HP_Regen" value = 100 reqs = - { "type", "name", "range" - "Building", "Barracks II", "City" - "UnitClass", "Land", "Local" + { "type", "name", "range", "present" + "Building", "Barracks II", "City", TRUE + "UnitClass", "Land", "Local", TRUE + "Building", "Barracks III", "City", FALSE } [effect_barracks_iii] @@ -834,8 +839,6 @@ "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE "UnitFlag", "NoVeteran", "Local", FALSE - "Building", "Barracks", "City", FALSE - "Building", "Barracks II", "City", FALSE } [effect_barracks_iii_1] Modified: trunk/data/experimental/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/effects.ruleset?rev=25022&r1=25021&r2=25022&view=diff ============================================================================== --- trunk/data/experimental/effects.ruleset (original) +++ trunk/data/experimental/effects.ruleset Mon Jun 2 23:27:09 2014 @@ -867,6 +867,8 @@ "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE "UnitFlag", "NoVeteran", "Local", FALSE + "Building", "Barracks II", "City", FALSE + "Building", "Barracks III", "City", FALSE } [effect_barracks_bl] @@ -878,24 +880,30 @@ "UnitClass", "Big Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE "UnitFlag", "NoVeteran", "Local", FALSE + "Building", "Barracks II", "City", FALSE + "Building", "Barracks III", "City", FALSE } [effect_barracks_1] type = "HP_Regen" value = 100 reqs = - { "type", "name", "range" - "Building", "Barracks", "City" - "UnitClass", "Land", "Local" + { "type", "name", "range", "present" + "Building", "Barracks", "City", TRUE + "UnitClass", "Land", "Local", TRUE + "Building", "Barracks II", "City", FALSE + "Building", "Barracks III", "City", FALSE } [effect_barracks_bl_1] type = "HP_Regen" value = 100 reqs = - { "type", "name", "range" - "Building", "Barracks", "City" - "UnitClass", "Big Land", "Local" + { "type", "name", "range", "present" + "Building", "Barracks", "City", TRUE + "UnitClass", "Big Land", "Local", TRUE + "Building", "Barracks II", "City", FALSE + "Building", "Barracks III", "City", FALSE } [effect_barracks_ii] @@ -907,7 +915,7 @@ "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE "UnitFlag", "NoVeteran", "Local", FALSE - "Building", "Barracks", "City", FALSE + "Building", "Barracks III", "City", FALSE } [effect_barracks_ii_bl] @@ -919,25 +927,27 @@ "UnitClass", "Big Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE "UnitFlag", "NoVeteran", "Local", FALSE - "Building", "Barracks", "City", FALSE + "Building", "Barracks III", "City", FALSE } [effect_barracks_ii_1] type = "HP_Regen" value = 100 reqs = - { "type", "name", "range" - "Building", "Barracks II", "City" - "UnitClass", "Land", "Local" + { "type", "name", "range", "present" + "Building", "Barracks II", "City", TRUE + "UnitClass", "Land", "Local", TRUE + "Building", "Barracks III", "City", FALSE } [effect_barracks_ii_bl_1] type = "HP_Regen" value = 100 reqs = - { "type", "name", "range" - "Building", "Barracks II", "City" - "UnitClass", "Big Land", "Local" + { "type", "name", "range", "present" + "Building", "Barracks II", "City", TRUE + "UnitClass", "Big Land", "Local", TRUE + "Building", "Barracks III", "City", FALSE } [effect_barracks_iii] @@ -949,8 +959,6 @@ "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE "UnitFlag", "NoVeteran", "Local", FALSE - "Building", "Barracks", "City", FALSE - "Building", "Barracks II", "City", FALSE } [effect_barracks_iii_bl] @@ -962,8 +970,6 @@ "UnitClass", "Big Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE "UnitFlag", "NoVeteran", "Local", FALSE - "Building", "Barracks", "City", FALSE - "Building", "Barracks II", "City", FALSE } [effect_barracks_iii_1] Modified: trunk/data/multiplayer/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/effects.ruleset?rev=25022&r1=25021&r2=25022&view=diff ============================================================================== --- trunk/data/multiplayer/effects.ruleset (original) +++ trunk/data/multiplayer/effects.ruleset Mon Jun 2 23:27:09 2014 @@ -802,15 +802,19 @@ "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE "UnitFlag", "NoVeteran", "Local", FALSE + "Building", "Barracks II", "City", FALSE + "Building", "Barracks III", "City", FALSE } [effect_barracks_1] type = "HP_Regen" value = 100 reqs = - { "type", "name", "range" - "Building", "Barracks", "City" - "UnitClass", "Land", "Local" + { "type", "name", "range", "present" + "Building", "Barracks", "City", TRUE + "UnitClass", "Land", "Local", TRUE + "Building", "Barracks II", "City", FALSE + "Building", "Barracks III", "City", FALSE } [effect_barracks_ii] @@ -822,16 +826,17 @@ "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE "UnitFlag", "NoVeteran", "Local", FALSE - "Building", "Barracks", "City", FALSE + "Building", "Barracks III", "City", FALSE } [effect_barracks_ii_1] type = "HP_Regen" value = 100 reqs = - { "type", "name", "range" - "Building", "Barracks II", "City" - "UnitClass", "Land", "Local" + { "type", "name", "range", "present" + "Building", "Barracks II", "City", TRUE + "UnitClass", "Land", "Local", TRUE + "Building", "Barracks III", "City", FALSE } [effect_barracks_iii] @@ -843,8 +848,6 @@ "UnitClass", "Land", "Local", TRUE "UnitFlag", "NonMil", "Local", FALSE "UnitFlag", "NoVeteran", "Local", FALSE - "Building", "Barracks", "City", FALSE - "Building", "Barracks II", "City", FALSE } [effect_barracks_iii_1] _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits