Escorts that happen in tier1 zones now always appear in the first and second...

Escorts that happen in tier1 zones now always appear in the first and second tier1 zones you do, no risk of missing them becasue of easy-tier1-zone-skip


git-svn-id: http://svn.net-core.org/repos/t-engine4@6176 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/class/Game.lua

@@ -1949,6 +1949,9 @@ end
 unlocks_list = {
 	birth_transmo_chest = "Birth option: Transmogrification Chest",
 	birth_zigur_sacrifice = "Birth option: Zigur sacrifice",
+	cosmetic_race_human_redhead = "Cosmetic: Redheads",
+	
+	difficulty_insane = "Difficulty: Insane",
 
 	campaign_infinite_dungeon = "Campaign: Infinite Dungeon",
 	campaign_arena = "Campaign: The Arena",
@@ -1961,7 +1964,7 @@ unlocks_list = {
 	mage_tempest = "Class tree: Storm",
 	mage_geomancer = "Class tree: Stone",
 	mage_pyromancer = "Class tree: Wildfire",
-	mage_cryomancer = "Class tree: uttercold",
+	mage_cryomancer = "Class tree: Uttercold",
 	mage_necromancer = "Class: Necromancer",
 
 	rogue_marauder = "Class: Marauder",

game/modules/tome/class/Player.lua

@@ -118,8 +118,29 @@ function _M:onEnterLevel(zone, level)
 	-- mark entrance (if applicable) as noticed
 	game.level.map.attrs(self.x, self.y, "noticed", true)
 
+	local escort_zone_name = zone.short_name
+	local escort_zone_offset = 0
+
+	if zone.tier1_escort then
+		escort_zone_offset = zone.tier1_escort - 1
+
+		self.entered_tier1_zones = self.entered_tier1_zones or {}
+		self.entered_tier1_zones.seen = self.entered_tier1_zones.seen or {}
+		self.entered_tier1_zones.nb = self.entered_tier1_zones.nb or 0
+		if not self.entered_tier1_zones.seen[zone.short_name] then
+			self.entered_tier1_zones.nb = self.entered_tier1_zones.nb + 1
+			self.entered_tier1_zones.seen[zone.short_name] = self.entered_tier1_zones.nb
+		end
+
+		escort_zone_name = "tier1."..self.entered_tier1_zones.seen[zone.short_name]
+		print("Entering tier1 zone for escort", escort_zone_name, escort_zone_offset, level.level - escort_zone_offset)
+		if self.random_escort_levels and self.random_escort_levels[escort_zone_name] then
+			table.print(self.random_escort_levels[escort_zone_name])
+		end
+	end
+
 	-- Fire random escort quest
-	if self.random_escort_levels and self.random_escort_levels[zone.short_name] and self.random_escort_levels[zone.short_name][level.level] then
+	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")
 	end
 

game/modules/tome/data/birth/races/construct.lua

@@ -37,7 +37,7 @@ newBirthDescriptor{
 			["Runic Golem"] = "allow",
 		},
 	},
-	random_escort_possibilities = { {"trollmire", 2, 3}, {"ruins-kor-pul", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
+	random_escort_possibilities = { {"tier1.1", 1, 2}, {"tier1.2", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
 }
 
 newBirthDescriptor

game/modules/tome/data/birth/races/dwarf.lua

@@ -49,7 +49,7 @@ newBirthDescriptor{
 		resolvers.inventory{ id=true, {defined="ORB_SCRYING"} },
 		resolvers.generic(function(e) e.hotkey[10] = {"inventory", "Orb of Scrying"} end),
 	},
-	random_escort_possibilities = { {"trollmire", 2, 3}, {"ruins-kor-pul", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
+	random_escort_possibilities = { {"tier1.1", 1, 2}, {"tier1.2", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
 
 	cosmetic_unlock = {
 		cosmetic_race_human_redhead = {

game/modules/tome/data/birth/races/elf.lua

@@ -98,7 +98,7 @@ newBirthDescriptor
 		resolvers.inscription("RUNE:_PHASE_DOOR", {cooldown=7, range=10}),
 	},
 	experience = 1.35,
-	random_escort_possibilities = { {"scintillating-caves", 2, 3}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
+	random_escort_possibilities = { {"tier1.1", 1, 2}, {"tier1.2", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
 }
 
 newBirthDescriptor
@@ -134,5 +134,5 @@ newBirthDescriptor
 		resolvers.inscription("INFUSION:_WILD", {cooldown=12, what={physical=true}, dur=4, power=14}),
 	},
 	experience = 1.30,
-	random_escort_possibilities = { {"norgos-lair", 2, 3}, {"heart-gloom", 1, 2}, {"daikara", 1, 3}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
+	random_escort_possibilities = { {"tier1.1", 1, 2}, {"tier1.2", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
 }

game/modules/tome/data/birth/races/halfling.lua

@@ -54,7 +54,7 @@ newBirthDescriptor{
 		resolvers.inventory{ id=true, {defined="ORB_SCRYING"} },
 		resolvers.generic(function(e) e.hotkey[10] = {"inventory", "Orb of Scrying"} end),
 	},
-	random_escort_possibilities = { {"trollmire", 2, 3}, {"ruins-kor-pul", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
+	random_escort_possibilities = { {"tier1.1", 1, 2}, {"tier1.2", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
 
 	cosmetic_unlock = {
 		cosmetic_race_human_redhead = {

game/modules/tome/data/birth/races/human.lua

@@ -55,7 +55,7 @@ newBirthDescriptor{
 		resolvers.inventory{ id=true, {defined="ORB_SCRYING"} },
 		resolvers.generic(function(e) e.hotkey[10] = {"inventory", "Orb of Scrying"} end),
 	},
-	random_escort_possibilities = { {"trollmire", 2, 3}, {"ruins-kor-pul", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
+	random_escort_possibilities = { {"tier1.1", 1, 2}, {"tier1.2", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
 
 	cosmetic_unlock = {
 		cosmetic_race_human_redhead = {

game/modules/tome/data/birth/races/undead.lua

@@ -65,7 +65,7 @@ newBirthDescriptor{
 		resolvers.inscription("RUNE:_SHIELDING", {cooldown=14, dur=5, power=100}),
 		resolvers.inscription("RUNE:_PHASE_DOOR", {cooldown=7, range=10}),
 	},
-	random_escort_possibilities = { {"trollmire", 2, 3}, {"ruins-kor-pul", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
+	random_escort_possibilities = { {"tier1.1", 1, 2}, {"tier1.2", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
 }
 
 newBirthDescriptor

game/modules/tome/data/birth/races/yeek.lua

@@ -51,7 +51,7 @@ newBirthDescriptor{
 		resolvers.inscription("INFUSION:_REGENERATION", {cooldown=10, dur=5, heal=60}),
 		resolvers.inscription("INFUSION:_WILD", {cooldown=12, what={physical=true}, dur=4, power=14}),
 	},
-	random_escort_possibilities = { {"trollmire", 2, 3}, {"ruins-kor-pul", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
+	random_escort_possibilities = { {"tier1.1", 1, 2}, {"tier1.2", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
 }
 
 ---------------------------------------------------------

game/modules/tome/data/zones/heart-gloom/zone.lua

@@ -26,6 +26,7 @@ return {
 	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
 	width = 50, height = 50,
 	tier1 = true,
+	tier1_escort = 1,
 --	all_remembered = true,
 	all_lited = true,
 	persistent = "zone",

game/modules/tome/data/zones/norgos-lair/zone.lua

@@ -28,6 +28,7 @@ return {
 --	all_remembered = true,
 	all_lited = true,
 	tier1 = true,
+	tier1_escort = 2,
 	day_night = true,
 	persistent = "zone",
 	color_shown = {0.7, 0.7, 0.7, 1},

game/modules/tome/data/zones/ruins-kor-pul/zone.lua

@@ -26,6 +26,7 @@ return {
 	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
 	width = 50, height = 50,
 	tier1 = true,
+	tier1_escort = 1,
 --	all_remembered = true,
 --	all_lited = true,
 	persistent = "zone",

game/modules/tome/data/zones/scintillating-caves/zone.lua

@@ -27,6 +27,7 @@ return {
 	width = 50, height = 50,
 --	all_remembered = true,
 	tier1 = true,
+	tier1_escort = 2,
 	all_lited = true,
 	persistent = "zone",
 	ambient_music = "Mystery.ogg",

game/modules/tome/data/zones/trollmire/zone.lua

@@ -29,6 +29,7 @@ return {
 	all_lited = true,
 	day_night = true,
 	tier1 = true,
+	tier1_escort = 2,
 	persistent = "zone",
 	ambient_music = "Rainy Day.ogg",
 	min_material_level = function() return game.state:isAdvanced() and 3 or 1 end,