Readded the Shorbear Hills to Nidavellir

data/credits.txt

@@ -12,5 +12,10 @@
 /data/map_templates/nidavellir/caverns_of_chaincolt_gates_underground.cfg (by the Battle for Wesnoth Team) (licensed under the GPL 2.0)
 /data/map_templates/nidavellir/caverns_of_chaincolt_gates_underground.png (by the Battle for Wesnoth Team) (licensed under the GPL 2.0)
 /data/map_templates/nidavellir/caverns_of_chaincolt_gates_underground_overlay.png (by the Battle for Wesnoth Team) (licensed under the GPL 2.0)
+/data/map_templates/nidavellir/shorbear_hills.cfg (by the Battle for Wesnoth Team) (licensed under the GPL 2.0)
+/data/map_templates/nidavellir/shorbear_hills.png (by the Battle for Wesnoth Team) (licensed under the GPL 2.0)
+/data/map_templates/nidavellir/shorbear_hills_overlay.png (by the Battle for Wesnoth Team) (licensed under the GPL 2.0)
 /data/planes/aethermaw.cfg (by the Battle for Wesnoth Team) (licensed under the GPL 2.0)
 /data/sites/nidavellir/chaincolt.cfg (by the Battle for Wesnoth Team) (licensed under the GPL 2.0)
+/data/sites/nidavellir/chaincolt_gates.cfg (by the Battle for Wesnoth Team) (licensed under the GPL 2.0)
+/data/sites/nidavellir/shorbear_hold.cfg (by the Battle for Wesnoth Team) (licensed under the GPL 2.0)

data/map_templates/nidavellir.cfg

@@ -61,7 +61,7 @@
 	[/generated_terrain]
 	[generated_neutral_unit]
 		unit_type = unit_gold_deposit
-		quantity = 2
+		quantity = 1
 	[/generated_neutral_unit]
 	[generated_neutral_unit]
 		unit_type = unit_silver_deposit
@@ -73,7 +73,7 @@
 	[/generated_neutral_unit]
 	[generated_neutral_unit]
 		unit_type = unit_iron_deposit
-		quantity = 8
+		quantity = 7
 	[/generated_neutral_unit]
 	[generated_neutral_unit]
 		unit_type = unit_mithril_deposit

data/map_templates/nidavellir/shorbear_hills.cfg

@@ -0,0 +1,33 @@
+[map_template]
+	ident = shorbear_hills #from Battle for Wesnoth: The Sceptre of Fire (Hills of the Shorbear Clan, Towards the Caves)
+	name = "Shorbear Hills"
+	main_template = nidavellir
+	width = 42
+	height = 40
+	terrain_image = "data/map_templates/nidavellir/shorbear_hills.png"
+	overlay_terrain_image = "data/map_templates/nidavellir/shorbear_hills_overlay.png"
+	[generated_neutral_unit]
+		unit_type = unit_gold_deposit
+		quantity = 1
+	[/generated_neutral_unit]
+	[generated_neutral_unit]
+		unit_type = unit_iron_deposit
+		quantity = 1
+	[/generated_neutral_unit]
+	[generated_neutral_unit]
+		unit_type = unit_yale_cave #it seems sensible to have a yale cave in the Shorbear Hills; hill dwarves should be some of the dwarven clans that use yales the most, so they should have some wild yales nearby
+		quantity = 1
+	[/generated_neutral_unit]
+	[player_location_generated_neutral_unit]
+		unit_type = unit_copper_deposit
+		quantity = 1
+	[/player_location_generated_neutral_unit]
+	[player_location_generated_neutral_unit]
+		unit_type = unit_wood_pile
+		quantity = 16
+	[/player_location_generated_neutral_unit]
+	[player_location_generated_neutral_unit]
+		unit_type = unit_stone_pile
+		quantity = 16
+	[/player_location_generated_neutral_unit]
+[/map_template]

data/sites/nidavellir/shorbear_hold.cfg

@@ -0,0 +1,26 @@
+[site]
+	ident = shorbear_hold #from Battle for Wesnoth: The Sceptre of Fire (Hills of the Shorbear Clan, Towards the Caves)
+	name = "Shorbear Hold"
+	map_template = shorbear_hills
+	major = true
+	position_x = 19
+	position_y = 16
+	core = shorbear_clan
+	[historical_owner]
+		date = years_wesnoth.25
+		faction = shorbear_clan
+	[/historical_owner]
+	[historical_owner]
+		date = years_wesnoth.35
+		faction = norlund_clan
+	[/historical_owner]
+	[historical_owner]
+		date = years_wesnoth.40
+	[/historical_owner]
+	[historical_building]
+		start_date = years_wesnoth.25
+		end_date = years_wesnoth.35
+		building_class = stronghold
+		unique = shorbear_hold
+	[/historical_building]
+[/site]

readme.txt

@@ -67,6 +67,9 @@ https://github.com/Andrettin/Wyrmsun
 - Fixed crash when changing resolution.
 - A message is now shown when the age of the player's faction has changed.
 
+* Scenarios
+- Readded the Shorbear Hills to Nidavellir.
+
 * Units
 - Archers and scouts now have a sight range of 6 rather than 5.
 

scripts/map_templates/nidavellir/shorbear_hills.lua

@@ -30,8 +30,6 @@
 --SetMapTemplateLayerConnector("nidavellir", "unit-cavern-entrance", {499, 209}, 1)
 --SetMapTemplateLayerConnector("nidavellir-underground", "unit-cavern-entrance", {499, 209}, 0)
 
-SetMapTemplateResource("nidavellir", "unit-yale-cave", {522, 230}) -- it seems sensible to have a yale cave in the Shorbear Hills; hill dwarves should be some of the dwarven clans that use yales the most, so they should have some wild yales nearby
-
 SetMapTemplateHero("nidavellir", "rugnur", "norlund-clan", {499, 209}, 34, 35)
 SetMapTemplateUnit("nidavellir", "unit-gnomish-duelist", "norlund-clan", {499, 209}, 34, 35) -- Gnomish Envoy
 SetMapTemplateHero("nidavellir", "baglur", "norlund-clan", {499, 209}, 34, 35)

scripts/settlements_nidavellir.lua

@@ -127,28 +127,6 @@ DefineSite("rugnurs-outpost", { -- from Battle for Wesnoth: The Sceptre of Fire
 	Regions = {}
 })
 
-DefineSite("shorbear-hold", { -- From Battle for Wesnoth: The Sceptre of Fire (Hills of the Shorbear Clan, Towards the Caves)
-	Name = "Shorbear Hold",
-	MapTemplate = "nidavellir",
-	Position = {515, 223},
-	Major = true,
-	CulturalNames = {
-		"dwarf", "Shorbear Hold"
-	},
-	Cores = {
-		"shorbear-clan"
-	},
-	HistoricalOwners = {
-		24, "shorbear-clan",
-		35, "norlund-clan",
-		40, ""
-	},
-	HistoricalBuildings = {
-		24, 35, "stronghold", "shorbear-hold"
-	},
-	Regions = {}
-})
-
 DefineSite("wildfang", { -- Wildfang tribe settlement site; this is the name of a tribe rather than a settlement, but we have no name for a settlement there yet
 	Name = "Wildfang",
 	MapTemplate = "nidavellir",