Author: cazfi
Date: Mon Apr 13 06:43:37 2015
New Revision: 28767

URL: http://svn.gna.org/viewcvs/freeciv?rev=28767&view=rev
Log:
Removed barbarian nations from default nationlist.ruleset, and added them to 
individual
nations.rulesets instead.

See patch #5693

Modified:
    branches/S2_6/data/civ1/nations.ruleset
    branches/S2_6/data/civ2/nations.ruleset
    branches/S2_6/data/civ2civ3/nations.ruleset
    branches/S2_6/data/classic/nations.ruleset
    branches/S2_6/data/default/nationlist.ruleset
    branches/S2_6/data/experimental/nations.ruleset
    branches/S2_6/data/multiplayer/nations.ruleset
    branches/S2_6/data/stub/nations.ruleset

Modified: branches/S2_6/data/civ1/nations.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ1/nations.ruleset?rev=28767&r1=28766&r2=28767&view=diff
==============================================================================
--- branches/S2_6/data/civ1/nations.ruleset     (original)
+++ branches/S2_6/data/civ1/nations.ruleset     Mon Apr 13 06:43:37 2015
@@ -24,7 +24,7 @@
 
 ; List of nations to embed to main nations.ruleset despite separate nationlist
 ; being used for other nations.
-; embedded_nations = ""
+;embedded_nations = ""
 
 [compatibility]
 ; Initial government for all the nations that do not

Modified: branches/S2_6/data/civ2/nations.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2/nations.ruleset?rev=28767&r1=28766&r2=28767&view=diff
==============================================================================
--- branches/S2_6/data/civ2/nations.ruleset     (original)
+++ branches/S2_6/data/civ2/nations.ruleset     Mon Apr 13 06:43:37 2015
@@ -26,7 +26,7 @@
 
 ; List of nations to embed to main nations.ruleset despite separate nationlist
 ; being used for other nations.
-; embedded_nations = ""
+;embedded_nations = ""
 
 [compatibility]
 ; Initial government for all the nations that do not

Modified: branches/S2_6/data/civ2civ3/nations.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/nations.ruleset?rev=28767&r1=28766&r2=28767&view=diff
==============================================================================
--- branches/S2_6/data/civ2civ3/nations.ruleset (original)
+++ branches/S2_6/data/civ2civ3/nations.ruleset Mon Apr 13 06:43:37 2015
@@ -21,7 +21,7 @@
 
 ; List of nations to embed to main nations.ruleset despite separate nationlist
 ; being used for other nations.
-; embedded_nations = ""
+embedded_nations = "barbarian", "pirate"
 
 [compatibility]
 ; Initial government for all the nations that do not
@@ -36,5 +36,8 @@
 ;aggressive_min = 50
 ;aggressive_max = 50
 
-; Please keep [ruledit] section in sync with this include line
+; Please keep [ruledit] section in sync with these includes
 *include "default/nationlist.ruleset"
+; This ruleset uses model of two separate barbarian nations
+*include "nation/barbarian.ruleset"
+*include "nation/pirate.ruleset"

Modified: branches/S2_6/data/classic/nations.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/nations.ruleset?rev=28767&r1=28766&r2=28767&view=diff
==============================================================================
--- branches/S2_6/data/classic/nations.ruleset  (original)
+++ branches/S2_6/data/classic/nations.ruleset  Mon Apr 13 06:43:37 2015
@@ -21,7 +21,7 @@
 
 ; List of nations to embed to main nations.ruleset despite separate nationlist
 ; being used for other nations.
-; embedded_nations = ""
+embedded_nations = "barbarian", "pirate"
 
 [compatibility]
 ; Initial government for all the nations that do not
@@ -36,5 +36,8 @@
 ;aggressive_min = 50
 ;aggressive_max = 50
 
-; Please keep [ruledit] section in sync with this include line
+; Please keep [ruledit] section in sync with these includes
 *include "default/nationlist.ruleset"
+; This ruleset uses model of two separate barbarian nations
+*include "nation/barbarian.ruleset"
+*include "nation/pirate.ruleset"

Modified: branches/S2_6/data/default/nationlist.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/default/nationlist.ruleset?rev=28767&r1=28766&r2=28767&view=diff
==============================================================================
--- branches/S2_6/data/default/nationlist.ruleset       (original)
+++ branches/S2_6/data/default/nationlist.ruleset       Mon Apr 13 06:43:37 2015
@@ -169,7 +169,6 @@
 *include "nation/bahraini.ruleset"
 *include "nation/bangladeshi.ruleset"
 *include "nation/barbadian.ruleset"
-*include "nation/barbarian.ruleset"
 *include "nation/bashkir.ruleset"
 *include "nation/basque.ruleset"
 *include "nation/bavarian.ruleset"
@@ -510,7 +509,6 @@
 *include "nation/phrygian.ruleset"
 *include "nation/pictish.ruleset"
 *include "nation/piedmontese.ruleset"
-*include "nation/pirate.ruleset"
 *include "nation/polish.ruleset"
 *include "nation/polynesian.ruleset"
 *include "nation/pontic.ruleset"

Modified: branches/S2_6/data/experimental/nations.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/experimental/nations.ruleset?rev=28767&r1=28766&r2=28767&view=diff
==============================================================================
--- branches/S2_6/data/experimental/nations.ruleset     (original)
+++ branches/S2_6/data/experimental/nations.ruleset     Mon Apr 13 06:43:37 2015
@@ -21,7 +21,7 @@
 
 ; List of nations to embed to main nations.ruleset despite separate nationlist
 ; being used for other nations.
-; embedded_nations = ""
+embedded_nations = "barbarian", "pirate"
 
 [compatibility]
 ; Initial government for all the nations that do not
@@ -36,5 +36,8 @@
 aggressive_min = 35
 aggressive_max = 80
 
-; Please keep [ruledit] section in sync with this include line
+; Please keep [ruledit] section in sync with these includes
 *include "default/nationlist.ruleset"
+; This ruleset uses model of two separate barbarian nations
+*include "nation/barbarian.ruleset"
+*include "nation/pirate.ruleset"

Modified: branches/S2_6/data/multiplayer/nations.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/multiplayer/nations.ruleset?rev=28767&r1=28766&r2=28767&view=diff
==============================================================================
--- branches/S2_6/data/multiplayer/nations.ruleset      (original)
+++ branches/S2_6/data/multiplayer/nations.ruleset      Mon Apr 13 06:43:37 2015
@@ -21,7 +21,7 @@
 
 ; List of nations to embed to main nations.ruleset despite separate nationlist
 ; being used for other nations.
-; embedded_nations = ""
+embedded_nations = "barbarian", "pirate"
 
 [compatibility]
 ; Initial government for all the nations that do not
@@ -36,5 +36,8 @@
 ;aggressive_min = 50
 ;aggressive_max = 50
 
-; Please keep [ruledit] section in sync with this include line
+; Please keep [ruledit] section in sync with these includes
 *include "default/nationlist.ruleset"
+; This ruleset uses model of two separate barbarian nations
+*include "nation/barbarian.ruleset"
+*include "nation/pirate.ruleset"

Modified: branches/S2_6/data/stub/nations.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/stub/nations.ruleset?rev=28767&r1=28766&r2=28767&view=diff
==============================================================================
--- branches/S2_6/data/stub/nations.ruleset     (original)
+++ branches/S2_6/data/stub/nations.ruleset     Mon Apr 13 06:43:37 2015
@@ -15,7 +15,7 @@
 
 ; List of nations to embed to main nations.ruleset despite separate nationlist
 ; being used for other nations.
-; embedded_nations = ""
+;embedded_nations = ""
 
 [default_traits]
 ;expansionist_min = 50


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

Reply via email to