Author: cazfi
Date: Sun Apr 19 13:02:17 2015
New Revision: 28807
URL: http://svn.gna.org/viewcvs/freeciv?rev=28807&view=rev
Log:
Use NationGroup requirements instead of separate Nation requirement for each
barbarian nation
in action enablers of supplied rulesets.
See patch #6004
Modified:
branches/S2_6/data/alien/game.ruleset
branches/S2_6/data/civ1/game.ruleset
branches/S2_6/data/civ2/game.ruleset
branches/S2_6/data/civ2civ3/game.ruleset
branches/S2_6/data/classic/game.ruleset
branches/S2_6/data/experimental/game.ruleset
branches/S2_6/data/multiplayer/game.ruleset
Modified: branches/S2_6/data/alien/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/alien/game.ruleset?rev=28807&r1=28806&r2=28807&view=diff
==============================================================================
--- branches/S2_6/data/alien/game.ruleset (original)
+++ branches/S2_6/data/alien/game.ruleset Sun Apr 19 13:02:17 2015
@@ -243,8 +243,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Lunatic", "Player", FALSE
- "Nation", "Madmen", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_incite_city]
Modified: branches/S2_6/data/civ1/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ1/game.ruleset?rev=28807&r1=28806&r2=28807&view=diff
==============================================================================
--- branches/S2_6/data/civ1/game.ruleset (original)
+++ branches/S2_6/data/civ1/game.ruleset Sun Apr 19 13:02:17 2015
@@ -223,7 +223,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_investigate_city]
@@ -245,7 +245,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_incite_city]
Modified: branches/S2_6/data/civ2/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2/game.ruleset?rev=28807&r1=28806&r2=28807&view=diff
==============================================================================
--- branches/S2_6/data/civ2/game.ruleset (original)
+++ branches/S2_6/data/civ2/game.ruleset Sun Apr 19 13:02:17 2015
@@ -268,8 +268,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_steal_tech_target]
@@ -282,8 +281,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_incite_city]
Modified: branches/S2_6/data/civ2civ3/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/game.ruleset?rev=28807&r1=28806&r2=28807&view=diff
==============================================================================
--- branches/S2_6/data/civ2civ3/game.ruleset (original)
+++ branches/S2_6/data/civ2civ3/game.ruleset Sun Apr 19 13:02:17 2015
@@ -269,8 +269,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_investigate_city]
@@ -292,8 +291,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_steal_tech_target]
@@ -306,8 +304,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_poison_city]
Modified: branches/S2_6/data/classic/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/game.ruleset?rev=28807&r1=28806&r2=28807&view=diff
==============================================================================
--- branches/S2_6/data/classic/game.ruleset (original)
+++ branches/S2_6/data/classic/game.ruleset Sun Apr 19 13:02:17 2015
@@ -261,8 +261,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_investigate_city]
@@ -298,8 +297,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_steal_tech_target]
@@ -312,8 +310,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_incite_city]
Modified: branches/S2_6/data/experimental/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/experimental/game.ruleset?rev=28807&r1=28806&r2=28807&view=diff
==============================================================================
--- branches/S2_6/data/experimental/game.ruleset (original)
+++ branches/S2_6/data/experimental/game.ruleset Sun Apr 19 13:02:17 2015
@@ -267,8 +267,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_explorer_establish_embassy]
@@ -282,8 +281,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_investigate_city]
@@ -319,8 +317,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_steal_tech_target]
@@ -333,8 +330,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_incite_city]
Modified: branches/S2_6/data/multiplayer/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/multiplayer/game.ruleset?rev=28807&r1=28806&r2=28807&view=diff
==============================================================================
--- branches/S2_6/data/multiplayer/game.ruleset (original)
+++ branches/S2_6/data/multiplayer/game.ruleset Sun Apr 19 13:02:17 2015
@@ -259,8 +259,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_investigate_city]
@@ -296,8 +295,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_steal_tech_target]
@@ -310,8 +308,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_incite_city]
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
