Reduced the four Prides to four levels instead of five

Reduced the High Peak to 10 levels


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

game/modules/tome/class/GameState.lua

@@ -1296,7 +1296,7 @@ function _M:createRandomBoss(base, data)
 	if data.ai then b.ai = data.ai
 	else b.ai = (b.rank > 3) and "tactical" or b.ai
 	end
-	b.ai_state = { talent_in=1, ai_move="move_astar" }
+	b.ai_state = { talent_in=1, ai_move=data.ai_move or "move_astar" }
 
 	-- Remove default equipment, if any
 	local todel = {}

game/modules/tome/data/maps/zones/prides.lua

@@ -38,12 +38,12 @@ defineTile(".", floor)
 defineTile("+", data.sublevel.door)
 defineTile("<", data.up)
 if level.level == zone.max_level then quickEntity(">", '.') else defineTile(">", data.down, nil, nil, nil, {no_teleport=true}) end
-if level.level == 1 then defineTile("O", floor, nil, {random_filter={type='humanoid', subtype='orc', special=function(e) return e.pride == data.sublevel.pride end, random_boss={nb_classes=1, loot_quality="store", loot_quantity=3, rank=3.5,}}})
+if level.level == 1 then defineTile("O", floor, nil, {random_filter={type='humanoid', subtype='orc', special=function(e) return e.pride == data.sublevel.pride end, random_boss={nb_classes=1, loot_quality="store", loot_quantity=3, ai_move="move_dmap", rank=3.5,}}})
 else quickEntity('O', 'o') end
 defineTile(";", floor, nil, nil, nil, {no_teleport=true})
 defineTile("*", "LEVER_DOOR", nil, nil, nil, nil, {type="lever", subtype="door"})
 defineTile("&", "LEVER", nil, nil, nil, nil, {type="lever", subtype="lever"})
-defineTile(" ", floor, nil, {entity_mod=function(e) e.make_escort = nil return e end, random_filter={type='humanoid', subtype='orc', special=function(e) return e.pride == data.sublevel.pride end, random_boss={nb_classes=1, loot_quality="store", loot_quantity=1, no_loot_randart=true, rank=3}}}, nil, {no_teleport=true})
+defineTile(" ", floor, nil, {entity_mod=function(e) e.make_escort = nil return e end, random_filter={type='humanoid', subtype='orc', special=function(e) return e.pride == data.sublevel.pride end, random_boss={nb_classes=1, loot_quality="store", loot_quantity=1, no_loot_randart=true, ai_move="move_dmap", rank=3}}}, nil, {no_teleport=true})
 
 -- addSpot section
 

game/modules/tome/data/zones/gorbat-pride/zone.lua

@@ -21,7 +21,7 @@ return {
 	name = "Gorbat Pride",
 	level_range = {35, 60},
 	level_scheme = "player",
-	max_level = 5,
+	max_level = 4,
 	decay = {300, 800},
 	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
 	width = 64, height = 64,

game/modules/tome/data/zones/grushnak-pride/zone.lua

@@ -27,7 +27,7 @@ return {
 	variable_zone_name = true,
 	level_range = {35, 60},
 	level_scheme = "player",
-	max_level = 10,
+	max_level = 8,
 	decay = {300, 800},
 	-- 10 levels but really only 5, the 5 others are just transitions
 	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + math.floor(level.level / 2) + rng.range(-1,2) end,
@@ -66,8 +66,9 @@ return {
 	},
 	post_process = function(level)
 		-- Place a lore note on each level
-		if level.level == 2 or level.level == 4 or level.level == 6 or level.level == 8 or level.level == 10 then
+		if level.level == 2 or level.level == 4 or level.level == 6 or level.level == 8 then
 			game:placeRandomLoreObject("GARKUL_HISTORY"..(level.level/2))
+			if level.level == 8 then game:placeRandomLoreObject("GARKUL_HISTORY5") end
 		end
 
 		for uid, e in pairs(level.entities) do e.faction = e.hard_faction or "orc-pride" end
@@ -94,12 +95,7 @@ return {
 			actor = { nb_npc = {0, 0} },
 			object = { nb_object = {0, 0} },
 		}},
-		[9] = { generator = {
-			map = { class = "engine.generator.map.Static", map = "zones/prides-middle" },
-			actor = { nb_npc = {0, 0} },
-			object = { nb_object = {0, 0} },
-		}},
-		[10] = {
+		[8] = {
 			generator = { map = {
 				down = "SLIME_TUNNELS",
 				force_last_stair = true,

game/modules/tome/data/zones/high-peak/grids.lua

@@ -192,7 +192,7 @@ newEntity{
 		nothing = true,
 		message = "#VIOLET#You enter the swirling portal and appear in a large room with other portals and the two wizards.",
 		on_use = function()
-			game:changeLevel(16) -- Special level, can not get to it any other way
+			game:changeLevel(11) -- Special level, can not get to it any other way
 			if game.player:hasQuest("high-peak"):isCompleted("sanctum-chat") then return end
 			local Chat = require "engine.Chat"
 			local chat = Chat.new("sorcerer-fight", {name="Elandar"}, game.player)

game/modules/tome/data/zones/high-peak/zone.lua

@@ -20,12 +20,12 @@
 return {
 	name = "High Peak",
 	display_name = function(x, y)
-		if game.level.level == 16 then return "High Peak: The Sanctum" end
+		if game.level.level == 11 then return "High Peak: The Sanctum" end
 		return "High Peak ("..game.level.level..")"
 	end,
 	level_range = {55, 80},
 	level_scheme = "player",
-	max_level = 15,
+	max_level = 10,
 	decay = {300, 800},
 	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
 	width = 50, height = 75,
@@ -77,7 +77,7 @@ return {
 		for uid, e in pairs(level.entities) do e.faction = e.hard_faction or "sorcerers" end
 
 		-- if we failed at charred scar (or did not do it at all) the gate of morning is destroyed and Aeryn turned to the service of the sorcerers
-		if level.level == 15 then
+		if level.level == 10 then
 			local mtdm = game.player:hasQuest("charred-scar")
 			if not mtdm or mtdm:isCompleted("not-stopped") then
 				game.player:hasQuest("high-peak"):failed_charred_scar(level)
@@ -90,7 +90,7 @@ return {
 	end,
 	levels =
 	{
-		[15] = {
+		[10] = {
 			generator = {
 				map = {
 					down = "PORTAL_BOSS",
@@ -98,7 +98,7 @@ return {
 				}
 			}
 		},
-		[16] = {
+		[11] = {
 			generator = {
 				map = {
 					class = "engine.generator.map.Static",

game/modules/tome/data/zones/rak-shor-pride/zone.lua

@@ -21,7 +21,7 @@ return {
 	name = "Rak'shor Pride",
 	level_range = {30, 60},
 	level_scheme = "player",
-	max_level = 5,
+	max_level = 4,
 	decay = {300, 800},
 	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
 	width = 64, height = 64,
@@ -78,7 +78,7 @@ return {
 				up = "SAND_UP_WILDERNESS",
 			}, },
 		},
-		[5] = {
+		[4] = {
 			generator = { map = {
 				down = "SAND_UP_WILDERNESS",
 			}, },

game/modules/tome/data/zones/vor-pride/zone.lua

@@ -21,7 +21,7 @@ return {
 	name = "Vor Pride",
 	level_range = {35, 60},
 	level_scheme = "player",
-	max_level = 5,
+	max_level = 4,
 	decay = {300, 800},
 	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
 	width = 64, height = 64,
@@ -70,7 +70,7 @@ return {
 	},
 	post_process = function(level)
 		-- Place a lore note on each level
-		game:placeRandomLoreObject("ORC_HISTORY"..level.level)
+		game:placeRandomLoreObjectScale("ORC_HISTORY", 5, level.level)
 
 		for uid, e in pairs(level.entities) do e.faction = e.hard_faction or "orc-pride" end
 	end,
@@ -81,7 +81,7 @@ return {
 				up = "FLAT_UP_WILDERNESS",
 			}, },
 		},
-		[5] = {
+		[4] = {
 			generator = { map = {
 				down = "FLAT_UP_WILDERNESS",
 			}, },