diff --git a/game/engine/interface/ActorTemporaryEffects.lua b/game/engine/interface/ActorTemporaryEffects.lua index cf057753bfeb1464e1a740a9fbf6ef649f12e66b..2e6084a754b8f64af1b64f7eba04d594b9d6d75f 100644 --- a/game/engine/interface/ActorTemporaryEffects.lua +++ b/game/engine/interface/ActorTemporaryEffects.lua @@ -105,7 +105,7 @@ function _M:setEffect(eff_id, dur, p, silent) if ret then game.logSeen(self, ret:gsub("#Target#", self.name:capitalize()):gsub("#target#", self.name)) end - if fly and game.flyers then + if fly and game.flyers and game.level.map.seens(self.x, self.y) then local sx, sy = game.level.map:getTileToScreen(self.x, self.y) game.flyers:add(sx, sy, 20, (rng.range(0,2)-1) * 0.5, -3, fly, {255,100,80}) end diff --git a/game/modules/tome/data/birth/races/dwarf.lua b/game/modules/tome/data/birth/races/dwarf.lua index 0fce19eaa6ea5fc3c07a461d336ed1d395dc09c4..585850bc6e132ec9bad667a0ad43d28ae54529b9 100644 --- a/game/modules/tome/data/birth/races/dwarf.lua +++ b/game/modules/tome/data/birth/races/dwarf.lua @@ -48,8 +48,8 @@ newBirthDescriptor{ copy = { faction = "lonely-mountain", type = "humanoid", subtype="dwarf", - default_wilderness = {39, 17}, - starting_zone = "tower-amon-sul", + default_wilderness = {43, 18}, + starting_zone = "trollshaws", starting_quest = "start-dunadan", starting_intro = "dwarf", life_rating=12, diff --git a/game/modules/tome/data/birth/races/elf.lua b/game/modules/tome/data/birth/races/elf.lua index fa210a9766465068f772721fcef92f959719e15e..0eaec837ccf65c4bbd40d1344d5096205918124f 100644 --- a/game/modules/tome/data/birth/races/elf.lua +++ b/game/modules/tome/data/birth/races/elf.lua @@ -47,8 +47,8 @@ newBirthDescriptor{ copy = { faction = "eryn-lasgalen", type = "humanoid", subtype="elf", - default_wilderness = {39, 17}, - starting_zone = "tower-amon-sul", + default_wilderness = {43, 18}, + starting_zone = "trollshaws", starting_quest = "start-dunadan", starting_intro = "elf", }, diff --git a/game/modules/tome/data/birth/races/hobbit.lua b/game/modules/tome/data/birth/races/hobbit.lua index 2075e696d1cc775843ecdb705bd713106aaa0f25..57fbda53e037008c7ae852ec65337423d485e7a2 100644 --- a/game/modules/tome/data/birth/races/hobbit.lua +++ b/game/modules/tome/data/birth/races/hobbit.lua @@ -45,8 +45,8 @@ newBirthDescriptor{ faction = "shire", type = "humanoid", subtype="hobbit", life_rating = 12, - default_wilderness = {39, 17}, - starting_zone = "tower-amon-sul", + default_wilderness = {43, 18}, + starting_zone = "trollshaws", starting_quest = "start-dunadan", starting_intro = "hobbit", }, diff --git a/game/modules/tome/data/birth/races/human.lua b/game/modules/tome/data/birth/races/human.lua index 5f8f62ac5423820483ee2566f6f4866950bf7ff6..a3bcd05cde49fd8850a654b1fb3599f1b49bcaff 100644 --- a/game/modules/tome/data/birth/races/human.lua +++ b/game/modules/tome/data/birth/races/human.lua @@ -60,8 +60,8 @@ newBirthDescriptor "Humans hailing from the northen town of Bree. A common kind of man, unremarkable in all respects.", }, copy = { - default_wilderness = {39, 17}, - starting_zone = "tower-amon-sul", + default_wilderness = {43, 18}, + starting_zone = "trollshaws", starting_quest = "start-dunadan", starting_intro = "bree-man", }, @@ -82,8 +82,8 @@ newBirthDescriptor [ActorTalents.T_DUNADAN_HEAL]=1, }, copy = { - default_wilderness = {39, 17}, - starting_zone = "tower-amon-sul", + default_wilderness = {43, 18}, + starting_zone = "trollshaws", starting_quest = "start-dunadan", starting_intro = "dunadan", }, diff --git a/game/modules/tome/data/birth/races/troll.lua b/game/modules/tome/data/birth/races/troll.lua index 25a3b101d815f8d91987d9a240341b1f09306427..69924d7d715320e4f8e9a3b6ed06d60b260c97f9 100644 --- a/game/modules/tome/data/birth/races/troll.lua +++ b/game/modules/tome/data/birth/races/troll.lua @@ -46,8 +46,8 @@ newBirthDescriptor{ copy = { faction = "orc-pride", type = "humanoid", subtype="troll", - default_wilderness = {39, 17, "wilderness-arda-fareast"}, - starting_zone = "tower-amon-sul", + default_wilderness = {43, 18, "wilderness-arda-fareast"}, + starting_zone = "trollshaws", starting_quest = "start-dunadan", starting_intro = "dwarf", life_rating=10, diff --git a/game/modules/tome/data/birth/races/undead.lua b/game/modules/tome/data/birth/races/undead.lua index 330b473c9e3ec3799c2d05d2550b2f1664c3967e..fe3e28ade10a3793fbe6d6beac809078d9800c35 100644 --- a/game/modules/tome/data/birth/races/undead.lua +++ b/game/modules/tome/data/birth/races/undead.lua @@ -79,8 +79,8 @@ newBirthDescriptor }, copy = { type = "undead", subtype="ghoul", - default_wilderness = {39, 17}, - starting_zone = "tower-amon-sul", + default_wilderness = {43, 18}, + starting_zone = "trollshaws", starting_quest = "start-dunadan", starting_intro = "ghoul", life_rating=14, @@ -124,8 +124,8 @@ newBirthDescriptor }, copy = { type = "undead", subtype="skeleton", - default_wilderness = {39, 17}, - starting_zone = "tower-amon-sul", + default_wilderness = {43, 18}, + starting_zone = "trollshaws", starting_quest = "start-dunadan", starting_intro = "skeleton", life_rating=12, diff --git a/game/modules/tome/data/zones/trollshaws/zone.lua b/game/modules/tome/data/zones/trollshaws/zone.lua index abea7a1e40d73733961e52d8251f1e0ba97ef39c..6b453e3515bc5b775fa5010a5576831fb08f1b7f 100644 --- a/game/modules/tome/data/zones/trollshaws/zone.lua +++ b/game/modules/tome/data/zones/trollshaws/zone.lua @@ -33,7 +33,8 @@ return { map = { class = "engine.generator.map.Forest", edge_entrances = {4,6}, - zoom = 5, + zoom = 4, + sqrt_percent = 30, noise = "fbm_perlin", floor = function() if rng.chance(20) then return "FLOWER" else return "GRASS" end end, wall = "TREE",