Caldera/Sludgenest/Conclave vaults (and Scoure Pits in Forbidden Cults) are now …

…mutualy exclusive, only one will exist per game. But one will always exist. In addition the racial 100% chance will only exist until the relevant unlock is gained

@@ -330,6 +330,7 @@ function _M:newGame()
 					self.creating_player = false
 
 					birth_done()
+					self.state:selectBonusZone()
 					self.player:check("on_birth_done")
 					self:setTacticalMode(self.always_target)
 					self:triggerHook{"ToME:birthDone"}
@@ -2887,6 +2888,10 @@ function _M:takeScreenshot(for_savefile)
 	end
 end
 
+function _M:isAllowedBuild(what)
+	return profile.mod.allow_build[what]
+end
+
 function _M:setAllowedBuild(what, notify)
 	-- Do not unlock things in easy mode
 	--if self.difficulty == self.DIFFICULTY_EASY then return end

@@ -3820,3 +3820,33 @@ function _M:unlockTalentCheck(tid, who)
 	end
 	return false, self.unlocked_talents[tid]
 end
+
+--- Get a list of possible "bonus zones" and pick at most one of them, to combat zone bloat
+-- Bonus zones need to be implemented as an event for a zone (usualy "wilderness" but not required)
+function _M:selectBonusZone()
+	local always_list, list = {}, {}
+
+	local function add(campaign, zone, event, level_range, always_cond)
+		if not game:getPlayer(true):hasDescriptor("world", campaign) then return end
+		if always_cond and always_cond() then always_list[#always_list+1] = {zone=zone, event=event, level_range=level_range}
+		else list[#list+1] = {zone=zone, event=event, level_range=level_range} end
+	end
+
+	-- always spawn noxious-caldera for Yeeks until the unlock isn't needed anymore
+	add("Maj'Eyal", "wilderness", "noxious-caldera", nil, function() return not game:isAllowedBuild("psionic_solipsist") and game:getPlayer(true):hasDescriptor("race", "Yeek") end)
+	 -- always spawn sludgenest for Thalore until the unlock isn't needed anymore
+	add("Maj'Eyal", "wilderness", "sludgenest", nil, function() return not game:isAllowedBuild("wilder_oozemancer") and game:getPlayer(true):hasDescriptor("subrace", "Thalore") end)
+	-- always spawn conclave-vault event for Shalore until the unlock isn't needed anymore
+	add("Maj'Eyal", "halfling-ruins", "conclave-vault", {3, 3}, function() return not game:isAllowedBuild("race_ogre") and game:getPlayer(true):hasDescriptor("subrace", "Shalore") end)
+
+	-- list and always_list are provided for weird corner cases, DO NOT USE THEM unless you *reallllllllllllllllllllly* need to
+	self:triggerHook{"GameState:bonusZone", add=add, list=list, always_list=always_list}
+
+	if #always_list > 0 then
+		self.selected_bonus_zone = rng.table(always_list)
+		print("[GameState] Selected bonus zone for always condition", self.selected_bonus_zone.zone, self.selected_bonus_zone.event, table.serialize(self.selected_bonus_zone.level_range or {}))
+	elseif #list > 0 then
+		self.selected_bonus_zone = rng.table(list)
+		print("[GameState] Selected bonus zone for normal condition", self.selected_bonus_zone.zone, self.selected_bonus_zone.event, table.serialize(self.selected_bonus_zone.level_range or {}))
+	end
+end

@@ -67,6 +67,10 @@ function _M:onLoadZoneFile(basedir)
 		self:triggerHook{"Zone:loadEvents", zone=self.short_name, events=evts}
 		if next(evts) then self.events = evts end
 	end
+	if game.state.selected_bonus_zone and game.state.selected_bonus_zone.zone == self.short_name then
+		if not self.events then self.events = {} end
+		table.insert(self.events, {name=game.state.selected_bonus_zone.event, level_range=game.state.selected_bonus_zone.level_range, minor=true, percent=100})
+	end
 end
 
 --- Make it work for high levels

@@ -22,8 +22,4 @@ return { one_per_level=true,
 	{name="protective-aura", minor=true, percent=50},
 	{name="necrotic-air", minor=true, percent=50},
 	{name="glowing-chest", minor=true, percent=20},
-	{name="conclave-vault", level_range={3, 3},
-		-- always spawn conclave-vault event for Shalore
-		percent=(table.get(game:getPlayer(true), "descriptor", "subrace") == "Shalore" and 100 or 30)
-	}
 }

@@ -17,11 +17,5 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
-local descriptor = table.get(game:getPlayer(true), "descriptor")
-
 return {
-	-- always spawn noxious-caldera for Yeeks (event file does additional tests)
-	{name="noxious-caldera", percent=(table.get(descriptor, "race") == "Yeek" and 100 or 30)},
-	 -- always spawn sludgenest for Thalore (event file does additional tests)
-	{name="sludgenest", percent=(table.get(descriptor, "subrace") == "Thalore" and 100 or 30)},
 }