webperimental: Switch to single barbarian nation mode

Signed-off-by: Marko Lindqvist <[email protected]>

freeciv/data/webperimental/game.ruleset

@@ -36,7 +36,8 @@ Differences compared to default web-ruleset are:\n\
 capital if it is communist.\n\
 - Unit stacks don't protect against spy actions\n\
 - Explorers can establish embassies once Writing is discovered. \
-This action consumes the explorer.\
+This action consumes the explorer.\n\
+- There's only one barbarian nation, attacking from both land and sea.\
 ")
 
 [options]
@@ -278,8 +279,7 @@ actor_reqs    =
     }
 target_reqs  =
     { "type",   "name", "range", "present"
-      "Nation", "Barbarian", "Player", FALSE
-      "Nation", "Pirate", "Player", FALSE
+      "NationGroup", "Barbarian", "Player", FALSE
     }
 
 [actionenabler_explorer_establish_embassy]
@@ -293,8 +293,7 @@ actor_reqs    =
     }
 target_reqs  =
     { "type",   "name", "range", "present"
-      "Nation", "Barbarian", "Player", FALSE
-      "Nation", "Pirate", "Player", FALSE
+      "NationGroup", "Barbarian", "Player", FALSE
     }
 
 [actionenabler_investigate_city]
@@ -330,8 +329,7 @@ actor_reqs    =
     }
 target_reqs  =
     { "type",   "name", "range", "present"
-      "Nation", "Barbarian", "Player", FALSE
-      "Nation", "Pirate", "Player", FALSE
+      "NationGroup", "Barbarian", "Player", FALSE
     }
 
 [actionenabler_steal_tech_target]
@@ -344,8 +342,7 @@ actor_reqs    =
     }
 target_reqs  =
     { "type",   "name", "range", "present"
-      "Nation", "Barbarian", "Player", FALSE
-      "Nation", "Pirate", "Player", FALSE
+      "NationGroup", "Barbarian", "Player", FALSE
     }
 
 [actionenabler_incite_city]

freeciv/data/webperimental/nations.ruleset

@@ -22,7 +22,7 @@ nationlist = "default/nationlist.ruleset"
 
 ; List of nations to embed to main nations.ruleset despite separate nationlist
 ; being used for other nations.
-embedded_nations = "barbarian", "pirate"
+embedded_nations = "barbarian"
 
 [compatibility]
 ; Initial government for all the nations that do not
@@ -39,6 +39,40 @@ aggressive_max = 85
 
 ; 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"
+
+; This ruleset uses model of single LandAndSea barbarian nation
+
+[nation_barbarian]
+
+translation_domain="freeciv"
+
+name=_("Barbarian")
+plural=_("?plural:Barbarians")
+groups="Core", "Barbarian"
+legend=_("Since the dawn of civilization, barbarians have been a threat to\
+ cultured peoples everywhere.")
+
+leaders = {
+ "name",        "sex"
+ "Genseric",    "Male"
+ "Alaric",      "Male"
+ "Theodoric",   "Male"
+ "Stilicho",    "Male"
+ "Attila",      "Male"
+ "Boadicea",    "Female"
+}
+
+flag="barbarian"
+flag_alt = "-"
+style = "European"
+
+init_techs=""
+init_buildings=""
+init_units=""
+
+cities = "Barbaricum"
+
+is_playable = FALSE
+barbarian_type = "LandAndSea"
+
+; nothing more needed for barbarians