Author: cazfi
Date: Sun Apr 19 13:02:10 2015
New Revision: 28806
URL: http://svn.gna.org/viewcvs/freeciv?rev=28806&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:
trunk/data/alien/game.ruleset
trunk/data/civ1/game.ruleset
trunk/data/civ2/game.ruleset
trunk/data/civ2civ3/game.ruleset
trunk/data/classic/game.ruleset
trunk/data/experimental/game.ruleset
trunk/data/multiplayer/game.ruleset
Modified: trunk/data/alien/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=28806&r1=28805&r2=28806&view=diff
==============================================================================
--- trunk/data/alien/game.ruleset (original)
+++ trunk/data/alien/game.ruleset Sun Apr 19 13:02:10 2015
@@ -253,8 +253,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Lunatic", "Player", FALSE
- "Nation", "Madmen", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_incite_city]
Modified: trunk/data/civ1/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=28806&r1=28805&r2=28806&view=diff
==============================================================================
--- trunk/data/civ1/game.ruleset (original)
+++ trunk/data/civ1/game.ruleset Sun Apr 19 13:02:10 2015
@@ -230,7 +230,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_investigate_city]
@@ -252,7 +252,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_incite_city]
Modified: trunk/data/civ2/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=28806&r1=28805&r2=28806&view=diff
==============================================================================
--- trunk/data/civ2/game.ruleset (original)
+++ trunk/data/civ2/game.ruleset Sun Apr 19 13:02:10 2015
@@ -275,8 +275,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_steal_tech_target]
@@ -289,8 +288,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_incite_city]
Modified: trunk/data/civ2civ3/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/game.ruleset?rev=28806&r1=28805&r2=28806&view=diff
==============================================================================
--- trunk/data/civ2civ3/game.ruleset (original)
+++ trunk/data/civ2civ3/game.ruleset Sun Apr 19 13:02:10 2015
@@ -279,8 +279,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_investigate_city]
@@ -302,8 +301,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_steal_tech_target]
@@ -316,8 +314,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_poison_city]
Modified: trunk/data/classic/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/game.ruleset?rev=28806&r1=28805&r2=28806&view=diff
==============================================================================
--- trunk/data/classic/game.ruleset (original)
+++ trunk/data/classic/game.ruleset Sun Apr 19 13:02:10 2015
@@ -268,8 +268,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_investigate_city]
@@ -305,8 +304,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_steal_tech_target]
@@ -319,8 +317,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_incite_city]
Modified: trunk/data/experimental/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/game.ruleset?rev=28806&r1=28805&r2=28806&view=diff
==============================================================================
--- trunk/data/experimental/game.ruleset (original)
+++ trunk/data/experimental/game.ruleset Sun Apr 19 13:02:10 2015
@@ -274,8 +274,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_explorer_establish_embassy]
@@ -289,8 +288,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_investigate_city]
@@ -326,8 +324,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_steal_tech_target]
@@ -340,8 +337,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_incite_city]
Modified: trunk/data/multiplayer/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/game.ruleset?rev=28806&r1=28805&r2=28806&view=diff
==============================================================================
--- trunk/data/multiplayer/game.ruleset (original)
+++ trunk/data/multiplayer/game.ruleset Sun Apr 19 13:02:10 2015
@@ -266,8 +266,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_investigate_city]
@@ -303,8 +302,7 @@
}
target_reqs =
{ "type", "name", "range", "present"
- "Nation", "Barbarian", "Player", FALSE
- "Nation", "Pirate", "Player", FALSE
+ "NationGroup", "Barbarian", "Player", FALSE
}
[actionenabler_steal_tech_target]
@@ -317,8 +315,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
