Author: cazfi
Date: Wed Dec 10 22:10:29 2014
New Revision: 27248

URL: http://svn.gna.org/viewcvs/freeciv?rev=27248&view=rev
Log:
Partisans are never granted to barbarians in any of the supplied rulesets.

See patch #5454

Modified:
    trunk/data/civ2/effects.ruleset
    trunk/data/civ2civ3/effects.ruleset
    trunk/data/classic/effects.ruleset
    trunk/data/experimental/effects.ruleset
    trunk/data/multiplayer/effects.ruleset

Modified: trunk/data/civ2/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/effects.ruleset?rev=27248&r1=27247&r2=27248&view=diff
==============================================================================
--- trunk/data/civ2/effects.ruleset     (original)
+++ trunk/data/civ2/effects.ruleset     Wed Dec 10 22:10:29 2014
@@ -838,26 +838,30 @@
       "Gov", "Democracy", "Player"
     }
 
-[effect_partisan_0]
+[effect_partisans_communism]
 type    = "Inspire_Partisans"
 value   = 1
 reqs    =
-    { "type",       "name",      "range"
-      "Gov", "Communism", "Player"
-      "Tech", "Communism", "Player"
-      "Tech", "Gunpowder", "Player"
-      "Tech", "Guerilla Warfare", "World"
-    }
-
-[effect_partisan_1]
+    { "type", "name", "range", "present"
+      "Gov", "Communism", "Player", TRUE
+      "Tech", "Communism", "Player", TRUE
+      "Tech", "Gunpowder", "Player", TRUE
+      "Tech", "Guerilla Warfare", "World", TRUE
+      "Nation", "Barbarian", "Player", FALSE
+      "Nation", "Pirate", "Player", FALSE
+    }
+
+[effect_partisans_democracy]
 type    = "Inspire_Partisans"
 value   = 1
 reqs    =
-    { "type",       "name",      "range"
-      "Gov", "Democracy", "Player"
-      "Tech", "Communism", "Player"
-      "Tech", "Gunpowder", "Player"
-      "Tech", "Guerilla Warfare", "World"
+    { "type", "name", "range", "present"
+      "Gov", "Democracy", "Player", TRUE
+      "Tech", "Communism", "Player", TRUE
+      "Tech", "Gunpowder", "Player", TRUE
+      "Tech", "Guerilla Warfare", "World", TRUE
+      "Nation", "Barbarian", "Player", FALSE
+      "Nation", "Pirate", "Player", FALSE
     }
 
 [effect_fundamentalism]

Modified: trunk/data/civ2civ3/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/effects.ruleset?rev=27248&r1=27247&r2=27248&view=diff
==============================================================================
--- trunk/data/civ2civ3/effects.ruleset (original)
+++ trunk/data/civ2civ3/effects.ruleset Wed Dec 10 22:10:29 2014
@@ -1581,22 +1581,26 @@
 type    = "Inspire_Partisans"
 value   = 1
 reqs    =
-    { "type", "name", "range"
-      "Gov", "Communism", "Player"
-      "Tech", "Communism", "Player"
-      "Tech", "Gunpowder", "Player"
-      "Tech", "Guerilla Warfare", "World"
+    { "type", "name", "range", "present"
+      "Gov", "Communism", "Player", TRUE
+      "Tech", "Communism", "Player", TRUE
+      "Tech", "Gunpowder", "Player", TRUE
+      "Tech", "Guerilla Warfare", "World", TRUE
+      "Nation", "Barbarian", "Player", FALSE
+      "Nation", "Pirate", "Player", FALSE
     }
 
 [effect_partisan_democracy]
 type    = "Inspire_Partisans"
 value   = 1
 reqs    =
-    { "type", "name", "range"
-      "Gov", "Democracy", "Player"
-      "Tech", "Communism", "Player"
-      "Tech", "Gunpowder", "Player"
-      "Tech", "Guerilla Warfare", "World"
+    { "type", "name", "range", "present"
+      "Gov", "Democracy", "Player", TRUE
+      "Tech", "Communism", "Player", TRUE
+      "Tech", "Gunpowder", "Player", TRUE
+      "Tech", "Guerilla Warfare", "World", TRUE
+      "Nation", "Barbarian", "Player", FALSE
+      "Nation", "Pirate", "Player", FALSE
     }
 
 [effect_bad_lux_anarchy]

Modified: trunk/data/classic/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/effects.ruleset?rev=27248&r1=27247&r2=27248&view=diff
==============================================================================
--- trunk/data/classic/effects.ruleset  (original)
+++ trunk/data/classic/effects.ruleset  Wed Dec 10 22:10:29 2014
@@ -695,26 +695,30 @@
       "Gov", "Democracy", "Player"
     }
 
-[effect_partisan_0]
+[effect_partisans_communism]
 type    = "Inspire_Partisans"
 value   = 1
 reqs   =
-    { "type",       "name",      "range"
-      "Gov", "Communism", "Player"
-      "Tech", "Communism", "Player"
-      "Tech", "Gunpowder", "Player"
-      "Tech", "Guerilla Warfare", "World"
-    }
-
-[effect_partisan_1]
+    { "type", "name", "range", "present"
+      "Gov", "Communism", "Player", TRUE
+      "Tech", "Communism", "Player", TRUE
+      "Tech", "Gunpowder", "Player", TRUE
+      "Tech", "Guerilla Warfare", "World", TRUE
+      "Nation", "Barbarian", "Player", FALSE
+      "Nation", "Pirate", "Player", FALSE
+    }
+
+[effect_partisans_democracy]
 type    = "Inspire_Partisans"
 value   = 1
 reqs   =
-    { "type",       "name",      "range"
-      "Gov", "Democracy", "Player"
-      "Tech", "Communism", "Player"
-      "Tech", "Gunpowder", "Player"
-      "Tech", "Guerilla Warfare", "World"
+    { "type", "name", "range", "present"
+      "Gov", "Democracy", "Player", TRUE
+      "Tech", "Communism", "Player", TRUE
+      "Tech", "Gunpowder", "Player", TRUE
+      "Tech", "Guerilla Warfare", "World", TRUE
+      "Nation", "Barbarian", "Player", FALSE
+      "Nation", "Pirate", "Player", FALSE
     }
 
 [effect_airport]

Modified: trunk/data/experimental/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/effects.ruleset?rev=27248&r1=27247&r2=27248&view=diff
==============================================================================
--- trunk/data/experimental/effects.ruleset     (original)
+++ trunk/data/experimental/effects.ruleset     Wed Dec 10 22:10:29 2014
@@ -760,26 +760,30 @@
       "Gov", "Democracy", "Player"
     }
 
-[effect_partisan_0]
+[effect_partisans_communism]
 type    = "Inspire_Partisans"
 value   = 1
 reqs   =
-    { "type",       "name",      "range"
-      "Gov", "Communism", "Player"
-      "Tech", "Communism", "Player"
-      "Tech", "Gunpowder", "Player"
-      "Tech", "Guerilla Warfare", "World"
-    }
-
-[effect_partisan_1]
+    { "type", "name", "range", "present"
+      "Gov", "Communism", "Player", TRUE
+      "Tech", "Communism", "Player", TRUE
+      "Tech", "Gunpowder", "Player", TRUE
+      "Tech", "Guerilla Warfare", "World", TRUE
+      "Nation", "Barbarian", "Player", FALSE
+      "Nation", "Pirate", "Player", FALSE
+    }
+
+[effect_partisans_democracy]
 type    = "Inspire_Partisans"
 value   = 1
 reqs   =
-    { "type",       "name",      "range"
-      "Gov", "Democracy", "Player"
-      "Tech", "Communism", "Player"
-      "Tech", "Gunpowder", "Player"
-      "Tech", "Guerilla Warfare", "World"
+    { "type", "name", "range", "present"
+      "Gov", "Democracy", "Player", TRUE
+      "Tech", "Communism", "Player", TRUE
+      "Tech", "Gunpowder", "Player", TRUE
+      "Tech", "Guerilla Warfare", "World", TRUE
+      "Nation", "Barbarian", "Player", FALSE
+      "Nation", "Pirate", "Player", FALSE
     }
 
 [effect_airport]

Modified: trunk/data/multiplayer/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/effects.ruleset?rev=27248&r1=27247&r2=27248&view=diff
==============================================================================
--- trunk/data/multiplayer/effects.ruleset      (original)
+++ trunk/data/multiplayer/effects.ruleset      Wed Dec 10 22:10:29 2014
@@ -704,26 +704,30 @@
       "Gov", "Democracy", "Player"
     }
 
-[effect_partisan_0]
+[effect_partisans_communism]
 type    = "Inspire_Partisans"
 value   = 1
 reqs   =
-    { "type",       "name",      "range"
-      "Gov", "Communism", "Player"
-      "Tech", "Communism", "Player"
-      "Tech", "Gunpowder", "Player"
-      "Tech", "Guerilla Warfare", "World"
-    }
-
-[effect_partisan_1]
+    { "type", "name", "range", "present"
+      "Gov", "Communism", "Player", TRUE
+      "Tech", "Communism", "Player", TRUE
+      "Tech", "Gunpowder", "Player", TRUE
+      "Tech", "Guerilla Warfare", "World", TRUE
+      "Nation", "Barbarian", "Player", FALSE
+      "Nation", "Pirate", "Player", FALSE
+    }
+
+[effect_partisans_democracy]
 type    = "Inspire_Partisans"
 value   = 1
 reqs   =
-    { "type",       "name",      "range"
-      "Gov", "Democracy", "Player"
-      "Tech", "Communism", "Player"
-      "Tech", "Gunpowder", "Player"
-      "Tech", "Guerilla Warfare", "World"
+    { "type", "name", "range", "present"
+      "Gov", "Democracy", "Player", TRUE
+      "Tech", "Communism", "Player", TRUE
+      "Tech", "Gunpowder", "Player", TRUE
+      "Tech", "Guerilla Warfare", "World", TRUE
+      "Nation", "Barbarian", "Player", FALSE
+      "Nation", "Pirate", "Player", FALSE
     }
 
 [effect_airport]


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

Reply via email to