Author: cazfi
Date: Wed Dec 10 22:10:39 2014
New Revision: 27249
URL: http://svn.gna.org/viewcvs/freeciv?rev=27249&view=rev
Log:
Partisans are never granted to barbarians in any of the supplied rulesets.
See patch #5454
Modified:
branches/S2_5/data/civ2/effects.ruleset
branches/S2_5/data/civ2civ3/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/civ2/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2/effects.ruleset?rev=27249&r1=27248&r2=27249&view=diff
==============================================================================
--- branches/S2_5/data/civ2/effects.ruleset (original)
+++ branches/S2_5/data/civ2/effects.ruleset Wed Dec 10 22:10:39 2014
@@ -832,7 +832,7 @@
"Gov", "Democracy", "Player"
}
-[effect_partisan_0]
+[effect_partisans_communism]
type = "Inspire_Partisans"
value = 1
reqs =
@@ -842,8 +842,13 @@
"Tech", "Gunpowder", "Player"
"Tech", "Guerilla Warfare", "World"
}
-
-[effect_partisan_1]
+nreqs =
+ { "type", "name", "range"
+ "Nation", "Barbarian", "Player"
+ "Nation", "Pirate", "Player"
+ }
+
+[effect_partisans_democracy]
type = "Inspire_Partisans"
value = 1
reqs =
@@ -852,6 +857,11 @@
"Tech", "Communism", "Player"
"Tech", "Gunpowder", "Player"
"Tech", "Guerilla Warfare", "World"
+ }
+nreqs =
+ { "type", "name", "range"
+ "Nation", "Barbarian", "Player"
+ "Nation", "Pirate", "Player"
}
[effect_fundamentalism]
Modified: branches/S2_5/data/civ2civ3/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2civ3/effects.ruleset?rev=27249&r1=27248&r2=27249&view=diff
==============================================================================
--- branches/S2_5/data/civ2civ3/effects.ruleset (original)
+++ branches/S2_5/data/civ2civ3/effects.ruleset Wed Dec 10 22:10:39 2014
@@ -1596,6 +1596,11 @@
"Tech", "Gunpowder", "Player"
"Tech", "Guerilla Warfare", "World"
}
+nreqs =
+ { "type", "name", "range"
+ "Nation", "Barbarian", "Player"
+ "Nation", "Pirate", "Player"
+ }
[effect_partisan_democracy]
type = "Inspire_Partisans"
@@ -1606,6 +1611,11 @@
"Tech", "Communism", "Player"
"Tech", "Gunpowder", "Player"
"Tech", "Guerilla Warfare", "World"
+ }
+nreqs =
+ { "type", "name", "range"
+ "Nation", "Barbarian", "Player"
+ "Nation", "Pirate", "Player"
}
[effect_bad_lux_anarchy]
Modified: branches/S2_5/data/classic/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/classic/effects.ruleset?rev=27249&r1=27248&r2=27249&view=diff
==============================================================================
--- branches/S2_5/data/classic/effects.ruleset (original)
+++ branches/S2_5/data/classic/effects.ruleset Wed Dec 10 22:10:39 2014
@@ -689,7 +689,7 @@
"Gov", "Democracy", "Player"
}
-[effect_partisan_0]
+[effect_partisans_communism]
type = "Inspire_Partisans"
value = 1
reqs =
@@ -699,8 +699,13 @@
"Tech", "Gunpowder", "Player"
"Tech", "Guerilla Warfare", "World"
}
-
-[effect_partisan_1]
+nreqs =
+ { "type", "name", "range"
+ "Nation", "Barbarian", "Player"
+ "Nation", "Pirate", "Player"
+ }
+
+[effect_partisans_democracy]
type = "Inspire_Partisans"
value = 1
reqs =
@@ -709,6 +714,11 @@
"Tech", "Communism", "Player"
"Tech", "Gunpowder", "Player"
"Tech", "Guerilla Warfare", "World"
+ }
+nreqs =
+ { "type", "name", "range"
+ "Nation", "Barbarian", "Player"
+ "Nation", "Pirate", "Player"
}
[effect_airport]
Modified: branches/S2_5/data/experimental/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/experimental/effects.ruleset?rev=27249&r1=27248&r2=27249&view=diff
==============================================================================
--- branches/S2_5/data/experimental/effects.ruleset (original)
+++ branches/S2_5/data/experimental/effects.ruleset Wed Dec 10 22:10:39 2014
@@ -754,7 +754,7 @@
"Gov", "Democracy", "Player"
}
-[effect_partisan_0]
+[effect_partisans_communism]
type = "Inspire_Partisans"
value = 1
reqs =
@@ -764,8 +764,13 @@
"Tech", "Gunpowder", "Player"
"Tech", "Guerilla Warfare", "World"
}
-
-[effect_partisan_1]
+nreqs =
+ { "type", "name", "range"
+ "Nation", "Barbarian", "Player"
+ "Nation", "Pirate", "Player"
+ }
+
+[effect_partisans_democracy]
type = "Inspire_Partisans"
value = 1
reqs =
@@ -774,6 +779,11 @@
"Tech", "Communism", "Player"
"Tech", "Gunpowder", "Player"
"Tech", "Guerilla Warfare", "World"
+ }
+nreqs =
+ { "type", "name", "range"
+ "Nation", "Barbarian", "Player"
+ "Nation", "Pirate", "Player"
}
[effect_airport]
Modified: branches/S2_5/data/multiplayer/effects.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/multiplayer/effects.ruleset?rev=27249&r1=27248&r2=27249&view=diff
==============================================================================
--- branches/S2_5/data/multiplayer/effects.ruleset (original)
+++ branches/S2_5/data/multiplayer/effects.ruleset Wed Dec 10 22:10:39 2014
@@ -698,7 +698,7 @@
"Gov", "Democracy", "Player"
}
-[effect_partisan_0]
+[effect_partisans_communism]
type = "Inspire_Partisans"
value = 1
reqs =
@@ -708,8 +708,13 @@
"Tech", "Gunpowder", "Player"
"Tech", "Guerilla Warfare", "World"
}
-
-[effect_partisan_1]
+nreqs =
+ { "type", "name", "range"
+ "Nation", "Barbarian", "Player"
+ "Nation", "Pirate", "Player"
+ }
+
+[effect_partisans_democracy]
type = "Inspire_Partisans"
value = 1
reqs =
@@ -718,6 +723,11 @@
"Tech", "Communism", "Player"
"Tech", "Gunpowder", "Player"
"Tech", "Guerilla Warfare", "World"
+ }
+nreqs =
+ { "type", "name", "range"
+ "Nation", "Barbarian", "Player"
+ "Nation", "Pirate", "Player"
}
[effect_airport]
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
