Tier 1 zones are now the target of other adventurers! After doing 3 of them you …

…may find out others came to do the rest before you could. (No this will not make you loose escorts)

@@ -60,6 +60,7 @@ function _M:grantQuest(quest, args)
 	self.quests[quest.id].gained_turn = game.turn
 	print("[QUEST] given to", self, quest.id)
 	self:check("on_quest_grant", quest)
+	return true
 end
 
 --- Sets the status of a quest for an actor

@@ -1117,6 +1117,19 @@ function _M:changeLevelReal(lev, zone, params)
 		world:seenZone(self.zone.short_name)
 		force_recreate = true
 	elseif not params.temporary_zone_shift then -- We move to a new zone as normal
+		local nztmp = nil
+		if zone then
+			if type(zone) == "string" then
+				nztmp = Zone.new(zone)
+			else
+				nztmp = zone
+			end
+			if nztmp.tier1 and table.count(self.state.tier1_zones_entered or {}) >= 3 then
+				Dialog:simplePopup("Empty place", "It looks like somebody came here first, the place is now empty.")
+				return
+			end
+		end
+
 		if self.zone and self.zone.on_leave then
 			local nl, nz, stop = self.zone.on_leave(lev, old_lev, zone)
 			if stop then self.change_level_party = nil self.change_level_party_back = nil return end
@@ -1131,11 +1144,7 @@ function _M:changeLevelReal(lev, zone, params)
 				self.zone:leaveLevel(false, lev, old_lev)
 				self.zone:leave()
 			end
-			if type(zone) == "string" then
-				self.zone = Zone.new(zone)
-			else
-				self.zone = zone
-			end
+			self.zone = nztmp
 			if self.zone.tier1 then
 				if lev == 1 and game.state:tier1Killed(game.state.birth.start_tier1_skip or 3) then
 					self.zone.tier1 = nil
@@ -1406,6 +1415,10 @@ function _M:changeLevelReal(lev, zone, params)
 	self.change_level_party = nil
 	self.change_level_party_back = nil
 
+	if self.zone and self.zone.tier1 then
+		self.state:registerT1ZoneVisit()
+	end
+
 	self:dieClonesDie()
 end
 

@@ -68,6 +68,23 @@ function _M:tier1Killed(nb)
 	return self.tier1_done >= nb
 end
 
+--- Called each time a T1 level is entered
+function _M:registerT1ZoneVisit()
+	self.tier1_zones_entered = self.tier1_zones_entered or {}
+	self.tier1_zones_entered[game.zone.short_name] = true
+
+	local p = game:getPlayer(true)
+	if not p or not p.random_escort_levels then return end
+	if self.tier1_escorts_reshuffled then return end
+
+	self.tier1_escorts_reshuffled = true
+	for _, zone in ipairs{"tier1.1", "tier1.2"} do
+		if p.random_escort_levels[zone] and not p.random_escort_levels[zone].seen_zone then
+			p:reshuffleEscortsZone(zone)
+		end
+	end
+end
+
 --- Sets unique as dead
 function _M:registerUniqueDeath(u)
 	if u.randboss then return end
@@ -97,6 +114,9 @@ end
 
 --- Discovered the far east
 function _M:goneEast()
+	if self.birth.on_change_to_advanced then
+		self.birth.on_change_to_advanced()
+	end
 	self.is_advanced = true
 end
 
@@ -116,12 +136,11 @@ function _M:canEastPatrol()
 end
 
 --- Setup a backup guardian for the given zone
-function _M:activateBackupGuardian(guardian, on_level, zonelevel, rumor, action)
+function _M:activateBackupGuardian(guardian, zone, on_level, zonelevel, rumor, action)
 	if self.is_advanced then return end
 	print("Zone guardian dead, setting up backup guardian", guardian, zonelevel)
-	self.allow_backup_guardians[game.zone.short_name] =
+	self.allow_backup_guardians[zone] =
 	{
-		name = game.zone.name,
 		guardian = guardian,
 		on_level = on_level,
 		new_level = zonelevel,

@@ -137,6 +137,31 @@ function _M:onBirth(birther)
 	self._on_birth = nil
 end
 
+function _M:reshuffleEscortsZone(zone)
+	-- Make a list of random escort levels
+	local birther = require "engine.Birther"
+	local race_def = birther.birth_descriptor_def.race[self.descriptor.race]
+	local subrace_def = birther.birth_descriptor_def.subrace[self.descriptor.subrace]
+	local world = birther.birth_descriptor_def.world[self.descriptor.world]
+	local def = subrace_def.random_escort_possibilities or race_def.random_escort_possibilities
+	if world.random_escort_possibilities then def = world.random_escort_possibilities end -- World overrides
+	if def then
+		local zones = {}
+		for i, zd in ipairs(def) do if zd[1] ~= "tier1.1" and zd[1] ~= "tier1.2" then
+			for j = zd[2], zd[3] do if not self.random_escort_levels[zd[1]] or not self.random_escort_levels[zd[1]][j] then
+				zones[#zones+1] = {zd[1], j}
+			end end
+		end end
+		for i, _ in pairs(self.random_escort_levels[zone]) do
+			local z = rng.tableRemove(zones)
+			print("Random escort on", z[1], z[2])
+			self.random_escort_levels[z[1]] = self.random_escort_levels[z[1]] or {}
+			self.random_escort_levels[z[1]][z[2]] = true
+		end
+		self.random_escort_levels[zone] = nil
+	end
+end
+
 function _M:onEnterLevel(zone, level)
 	-- Save where we entered
 	self.entered_level = {x=self.x, y=self.y}
@@ -166,8 +191,11 @@ function _M:onEnterLevel(zone, level)
 	end
 
 	-- Fire random escort quest
-	if self.random_escort_levels and self.random_escort_levels[escort_zone_name] and self.random_escort_levels[escort_zone_name][level.level - escort_zone_offset] then
-		self:grantQuest("escort-duty")
+	if self.random_escort_levels and self.random_escort_levels[escort_zone_name] then
+		self.random_escort_levels[escort_zone_name].seen_zone = true
+		if self.random_escort_levels[escort_zone_name][level.level - escort_zone_offset] then
+			self:grantQuest("escort-duty")
+		end
 	end
 
 	-- Cancel effects

@@ -64,6 +64,7 @@ function _M:grantQuest(quest, args)
 	self.quests[quest.id].gained_turn = game.turn
 	print("[QUEST] given to", self, quest.id)
 	self:check("on_quest_grant", quest)
+	return true
 end
 
 --- Sets the status of a quest for an actor

@@ -89,6 +89,26 @@ newBirthDescriptor{
 			local x, y = mod.class.Encounter:findSpot(where)
 			return x, y
 		end,
+		on_change_to_advanced = function()
+			game.state:activateBackupGuardian("ALUIN", "trollmire", 1, 35, "... and we thought the trollmire was safer now!")
+			game.state:activateBackupGuardian("SPELLBLAZE_SIMULACRUM", "scintillating-caves", 1, 35, "I heard that some old crystals are nearly alive now in the scintillating caves.")
+			game.state:activateBackupGuardian("CORRUPTED_SAND_WYRM", "sandworm-lair", 1, 45, "Did you hear? Something seems to have devoured all the last sandworms!", function(gen)
+				if gen then return end
+				for i = #game.level.e_array, 1, -1 do
+					local e = game.level.e_array[i]
+					if not e.unique and not e.player then game.level:removeEntity(e) end
+				end
+			end)
+			game.state:activateBackupGuardian("KOR_FURY", "ruins-kor-pul", 1, 35, ".. yes I tell you! The old ruins of Kor'Pul are still haunted!")
+			game.state:activateBackupGuardian("LITHFENGEL", "reknor", 4, 35, "They say that after it has been confirmed orcs still inhabited Reknor, they found a mighty demon there.", function(gen)
+				if gen then require("engine.ui.Dialog"):simpleLongPopup("Danger...", "When last you saw it, this cavern was littered with the corpses of orcs that you had slain. Now many, many more corpses carpet the floor, all charred and reeking of sulfur. An orange glow dimly illuminates the far reaches of the cavern to the east.", 400) end
+			end)
+			game.state:activateBackupGuardian("SNAPROOT", "old-forest", 1, 50, "Have you heard, the old forest seems to have been claimed by a new evil!")
+			game.state:activateBackupGuardian("NIMISIL", "maze", 1, 40, "Have you hard about the patrol that disappeared in the maze in the west?")
+			game.state:activateBackupGuardian("PALE_DRAKE", "dreadfell", 1, 40, "It has been months since the hero cleansed the Dreadfell, yet rumours are growing: evil is back.")
+			game.state:activateBackupGuardian("ABOMINATION", "deep-bellow", 1, 35, "I have heard a dwarf whispering about some abomination in the deep bellow.")
+			game.state:activateBackupGuardian("MASSOK", "daikara", 1, 43, "I have heard there is a dragon hunter in the Daikara that is unhappy about the wyrm being already dead.")
+		end,
 		zone_tiers = {
 			{name="tier1", "trollmire", "norgos-lair", "scintillating-caves", "rhaloren-camp", "heart-gloom", "ruins-kor-pul"},
 			{name="tier2", "sandworm-lair", "old-forest", "maze", "daikara", "halfling-ruins"},

@@ -333,6 +333,7 @@ local function getPortalSpot(npc, dist, min_dist)
 end
 
 on_grant = function(self, who)
+-- do return true end
 	local x, y = util.findFreeGrid(who.x, who.y, 10, true, {[engine.Map.ACTOR]=true})
 	if not x then return true end
 

@@ -83,7 +83,6 @@ newEntity{ define_as = "RANTHA_THE_WORM",
 	resolvers.inscriptions(1, "infusion"),
 
 	on_die = function(self, who)
-		game.state:activateBackupGuardian("MASSOK", 4, 43, "I have heard there is a dragon hunter in the Daikara that is unhappy about the wyrm being already dead.")
 		game.player:resolveSource():grantQuest("starter-zones")
 		game.player:resolveSource():setQuestStatus("starter-zones", engine.Quest.COMPLETED, "daikara")
 		
@@ -146,7 +145,6 @@ newEntity{ define_as = "VARSHA_THE_WRITHING",
 	resolvers.inscriptions(1, "infusion"),
 
 	on_die = function(self, who)
-		game.state:activateBackupGuardian("MASSOK", 4, 43, "I have heard there is a dragon hunter in the Daikara that is unhappy about the wyrm being already dead.")
 		game.player:resolveSource():grantQuest("starter-zones")
 		game.player:resolveSource():setQuestStatus("starter-zones", engine.Quest.COMPLETED, "daikara")
 		game.player:resolveSource():setQuestStatus("starter-zones", engine.Quest.COMPLETED, "daikara-volcano")

@@ -80,7 +80,6 @@ newEntity{ base="BASE_NPC_CORRUPTED_HORROR", define_as = "THE_MOUTH",
 
 	on_die = function(self, who)
 		game.player:resolveSource():setQuestStatus("deep-bellow", engine.Quest.COMPLETED)
-		game.state:activateBackupGuardian("ABOMINATION", 3, 35, "I have heard a dwarf whispering about some abomination in the deep bellow.")
 
 		if game:getPlayer(true).female then
 			game:setAllowedBuild("cosmetic_race_dwarf_female_beard", true)

@@ -113,8 +113,6 @@ newEntity{ define_as = "THE_MASTER",
 	resolvers.inscriptions(1, {"manasurge rune"}),
 
 	on_die = function(self, who)
-		game.state:activateBackupGuardian("PALE_DRAKE", 1, 40, "It has been months since the hero cleansed the Dreadfell, yet rumours are growing: evil is back.")
-
 		world:gainAchievement("VAMPIRE_CRUSHER", game.player:resolveSource())
 		game.player:resolveSource():grantQuest("dreadfell")
 		game.player:resolveSource():setQuestStatus("dreadfell", engine.Quest.COMPLETED)

@@ -90,7 +90,6 @@ newEntity{ define_as = "HORNED_HORROR",
 	resolvers.inscriptions(1, {"invisibility rune"}),
 
 	on_die = function(self, who)
-		game.state:activateBackupGuardian("NIMISIL", 2, 40, "Have you hard about the patrol that disappeared in the maze in the west?")
 		game.player:resolveSource():grantQuest("starter-zones")
 		game.player:resolveSource():setQuestStatus("starter-zones", engine.Quest.COMPLETED, "maze")
 		game.player:resolveSource():setQuestStatus("starter-zones", engine.Quest.COMPLETED, "maze-horror")
@@ -143,7 +142,6 @@ newEntity{ define_as = "MINOTAUR_MAZE",
 	resolvers.inscriptions(2, "infusion"),
 
 	on_die = function(self, who)
-		game.state:activateBackupGuardian("NIMISIL", 2, 40, "Have you hard about the patrol that disappeared in the maze in the west?")
 		game.player:resolveSource():grantQuest("starter-zones")
 		game.player:resolveSource():setQuestStatus("starter-zones", engine.Quest.COMPLETED, "maze")
 	end,

@@ -82,7 +82,6 @@ newEntity{ define_as = "SHARDSKIN",
 	resolvers.inscriptions(1, "rune"),
 
 	on_die = function(self, who)
-		game.state:activateBackupGuardian("SNAPROOT", 3, 50, "Have you heard, the old forest seems to have been claimed by a new evil!")
 		game.player:resolveSource():grantQuest("starter-zones")
 		game.player:resolveSource():setQuestStatus("starter-zones", engine.Quest.COMPLETED, "old-forest")
 		game.player:resolveSource():setQuestStatus("starter-zones", engine.Quest.COMPLETED, "old-forest-crystal")
@@ -133,7 +132,6 @@ newEntity{ define_as = "WRATHROOT",
 	resolvers.inscriptions(1, "infusion"),
 
 	on_die = function(self, who)
-		game.state:activateBackupGuardian("SNAPROOT", 3, 50, "Have you heard, the old forest seems to have been claimed by a new evil!")
 		game.player:resolveSource():grantQuest("starter-zones")
 		game.player:resolveSource():setQuestStatus("starter-zones", engine.Quest.COMPLETED, "old-forest")
 	end,

@@ -99,10 +99,6 @@ newEntity{ define_as = "GOLBUG",
 	end,
 
 	on_die = function(self, who)
-		game.state:activateBackupGuardian("LITHFENGEL", 4, 35, "They say that after it has been confirmed orcs still inhabited Reknor, they found a mighty demon there.", function(gen)
-			if gen then require("engine.ui.Dialog"):simpleLongPopup("Danger...", "When last you saw it, this cavern was littered with the corpses of orcs that you had slain. Now many, many more corpses carpet the floor, all charred and reeking of sulfur. An orange glow dimly illuminates the far reaches of the cavern to the east.", 400) end
-		end)
-
 		world:gainAchievement("DESTROYER_BANE", game.player:resolveSource())
 		game.player:setQuestStatus("orc-hunt", engine.Quest.DONE)
 		game.player:grantQuest("wild-wild-east")

@@ -85,7 +85,6 @@ newEntity{ define_as = "SHADE",
 	low_level_tactics_override = {escape=0, safe_range=1},
 
 	on_die = function(self, who)
-		game.state:activateBackupGuardian("KOR_FURY", 3, 35, ".. yes I tell you! The old ruins of Kor'Pul are still haunted!")
 		game.player:resolveSource():setQuestStatus("start-allied", engine.Quest.COMPLETED, "kor-pul")
 	end,
 }
@@ -129,7 +128,6 @@ newEntity{ base = "BASE_NPC_THIEF", define_as = "THE_POSSESSED",
 	low_level_tactics_override = {escape=0, safe_range=1},
 	
 	on_die = function(self, who)
-		game.state:activateBackupGuardian("KOR_FURY", 3, 35, ".. yes I tell you! The old ruins of Kor'Pul are still haunted!")
 		game.player:resolveSource():setQuestStatus("start-allied", engine.Quest.COMPLETED, "kor-pul")
 		game.player:resolveSource():setQuestStatus("start-allied", engine.Quest.COMPLETED, "kor-pul-invaded")
 	end,

@@ -157,13 +157,6 @@ newEntity{ define_as = "SANDWORM_QUEEN",
 	end,
 
 	on_die = function(self, who)
-		game.state:activateBackupGuardian("CORRUPTED_SAND_WYRM", 1, 45, "Did you hear? Something seems to have devoured all the last sandworms!", function(gen)
-			if gen then return end
-			for i = #game.level.e_array, 1, -1 do
-				local e = game.level.e_array[i]
-				if not e.unique and not e.player then game.level:removeEntity(e) end
-			end
-		end)
 		game.player:resolveSource():grantQuest("starter-zones")
 		game.player:resolveSource():setQuestStatus("starter-zones", engine.Quest.COMPLETED, "sandworm-lair")
 	end,

@@ -65,7 +65,6 @@ newEntity{ base="BASE_NPC_CRYSTAL", define_as = "SPELLBLAZE_CRYSTAL",
 
 	on_die = function(self, who)
 		game.player:resolveSource():setQuestStatus("start-shaloren", engine.Quest.COMPLETED, "spellblaze")
-		game.state:activateBackupGuardian("SPELLBLAZE_SIMULACRUM", 3, 35, "I heard that some old crystals are nearly alive now in the scintillating caves.")
 	end,
 }
 

@@ -104,7 +104,6 @@ newEntity{ define_as = "TROLL_PROX",
 				game.zone:addEntity(game.level, n, "object", self.x, self.y)
 			end
 		end
-		game.state:activateBackupGuardian("ALUIN", 2, 35, "... and we thought the trollmire was safer now!")
 		game.player:resolveSource():setQuestStatus("start-allied", engine.Quest.COMPLETED, "trollmire")
 	end,
 }
@@ -170,7 +169,6 @@ newEntity{ define_as = "TROLL_SHAX",
 				game.zone:addEntity(game.level, n, "object", self.x, self.y)
 			end
 		end
-		game.state:activateBackupGuardian("ALUIN", 2, 35, "... and we thought the trollmire was safer now!")
 		game.player:resolveSource():setQuestStatus("start-allied", engine.Quest.COMPLETED, "trollmire")
 		game.player:resolveSource():setQuestStatus("start-allied", engine.Quest.COMPLETED, "trollmire-flooded")
 	end,