Stay put limmir! Good boy!

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

game/modules/tome/class/Game.lua

@@ -394,14 +394,22 @@ function _M:changeLevel(lev, zone, keep_old_lev, force_down)
 
 	-- Decay level ?
 	if self.level.last_turn and self.level.data.decay and self.level.last_turn + self.level.data.decay[1] * 10 < self.turn then
-		local nb_actor, remain_actor = self.level:decay(Map.ACTOR, function(e) return not e.unique and not e.lore and not e.quest and self.level.last_turn + rng.range(self.level.data.decay[1], self.level.data.decay[2]) < self.turn * 10 end)
-		local nb_object, remain_object = self.level:decay(Map.OBJECT, function(e) return not e.unique and not e.lore and not e.quest and self.level.last_turn + rng.range(self.level.data.decay[1], self.level.data.decay[2]) < self.turn * 10 end)
-
-		local gen = self.zone:getGenerator("actor", self.level)
-		if gen.regenFrom then gen:regenFrom(remain_actor) end
+		local only = self.level.data.decay.only or nil
+		if not only or only.actor then
+			local nb_actor, remain_actor = self.level:decay(Map.ACTOR, function(e) return not e.unique and not e.lore and not e.quest and self.level.last_turn + rng.range(self.level.data.decay[1], self.level.data.decay[2]) < self.turn * 10 end)
+			if not self.level.data.decay.no_respawn then
+				local gen = self.zone:getGenerator("actor", self.level)
+				if gen.regenFrom then gen:regenFrom(remain_actor) end
+			end
+		end
 
-		local gen = self.zone:getGenerator("object", self.level)
-		if gen.regenFrom then gen:regenFrom(remain_object) end
+		if not only or only.object then
+			local nb_object, remain_object = self.level:decay(Map.OBJECT, function(e) return not e.unique and not e.lore and not e.quest and self.level.last_turn + rng.range(self.level.data.decay[1], self.level.data.decay[2]) < self.turn * 10 end)
+			if not self.level.data.decay.no_respawn then
+				local gen = self.zone:getGenerator("object", self.level)
+				if gen.regenFrom then gen:regenFrom(remain_object) end
+			end
+		end
 	end
 
 	-- Move back to old wilderness position
@@ -643,6 +651,8 @@ function _M:setupCommands()
 				self.player.esp.all = 1
 				self.player.esp.range = 50
 				self.player.inc_damage.all = 100000
+				self.player.wild_x = 162
+				self.player.wild_y = 31
 --				self:changeLevel(5, "gorbat-pride")
 --				self:changeLevel(1, "town-gates-of-morning")
 				self:changeLevel(1, "wilderness")

game/modules/tome/data/chats/corruptor-quest.lua

@@ -52,8 +52,7 @@ Let us join forces and crush the fools!]],
 newChat{ id="quest3",
 	text = [[Good. Before your... untimely arrival we were preparing an attack on the Ziguranth main training camp, on the southern beach of the sea of Sash.
 Come with us, let's destroy them!
-Take this stone, it should help counter the antimagic powers of the Ziguranth.
-And now I will open a portal to Zigur and the massacre shall begin!]],
+I will open a portal to Zigur and the massacre shall begin!]],
 	answers = {
 		{"I am ready!", action=function(npc, player)
 			if game.zone.short_name ~= "mark-spellblaze" then return "quest3" end

game/modules/tome/data/zones/town-angolwen/zone.lua

@@ -22,7 +22,7 @@ return {
 	level_range = {20, 20},
 	max_level = 1,
 	width = 50, height = 50,
-	decay = {300, 800},
+	decay = {300, 800, only={object=true}, no_respawn=true},
 	persistant = "zone",
 --	all_remembered = true,
 	all_lited = true,

game/modules/tome/data/zones/town-derth/zone.lua

@@ -23,7 +23,7 @@ return {
 	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
 	max_level = 1,
 	width = 196, height = 80,
-	decay = {300, 800},
+	decay = {300, 800, only={object=true}, no_respawn=true},
 	persistant = "zone",
 	all_remembered = true,
 	all_lited = true,

game/modules/tome/data/zones/town-gates-of-morning/zone.lua

@@ -22,7 +22,7 @@ return {
 	level_range = {33, 33},
 	max_level = 1,
 	width = 196, height = 80,
-	decay = {300, 800},
+	decay = {300, 800, only={object=true}, no_respawn=true},
 	persistant = "zone",
 	all_remembered = true,
 	all_lited = true,

game/modules/tome/data/zones/town-last-hope/zone.lua

@@ -22,7 +22,7 @@ return {
 	level_range = {15, 15},
 	max_level = 1,
 	width = 196, height = 80,
-	decay = {300, 800},
+	decay = {300, 800, only={object=true}, no_respawn=true},
 	persistant = "zone",
 	all_remembered = true,
 	all_lited = true,

game/modules/tome/data/zones/town-lumberjack-village/zone.lua

@@ -22,7 +22,7 @@ return {
 	level_range = {8, 14},
 	max_level = 1,
 	width = 25, height = 25,
-	decay = {300, 800},
+	decay = {300, 800, only={object=true}, no_respawn=true},
 	persistant = "zone",
 --	all_remembered = true,
 	all_lited = true,

game/modules/tome/data/zones/town-zigur/zone.lua

@@ -23,7 +23,7 @@ return {
 	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
 	max_level = 1,
 	width = 50, height = 50,
-	decay = {300, 800},
+	decay = {300, 800, only={object=true}, no_respawn=true},
 	persistant = "zone",
 	no_worldport = true,
 	all_remembered = true,