diff --git a/game/modules/tome/data/chats/derth-attack-over.lua b/game/modules/tome/data/chats/derth-attack-over.lua
index ca4cb49c88080f615b37b696e7ec715c42b83784..6f248e07a077428fdeb9a25250498f78b7ff2204 100644
--- a/game/modules/tome/data/chats/derth-attack-over.lua
+++ b/game/modules/tome/data/chats/derth-attack-over.lua
@@ -35,7 +35,8 @@ I do not know. I was tending my crop just outside the town when I heard screamin
newChat{ id="quest2",
text = [[Thank you! You have saved many people today!
-I have heard of rumours of a reclusive town of wise and powerful men somewhere in the blue mountains. Maybe they could help? If they even exist...]],
+I have heard of rumours of a reclusive town of wise and powerful men somewhere in the mountains. Maybe they could help? If they even exist...
+There are also those zigur-something people that claim to fight magic. Why are they not here?!]],
answers = {
{"I will not let you down.", action=function(npc, player) player:hasQuest("lightning-overload"):done_derth() end},
}
diff --git a/game/modules/tome/data/chats/myssil.lua b/game/modules/tome/data/chats/myssil.lua
new file mode 100644
index 0000000000000000000000000000000000000000..1eca127a9b9b68ad81eee7f7eca5c1fcbbcb68c7
--- /dev/null
+++ b/game/modules/tome/data/chats/myssil.lua
@@ -0,0 +1,55 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+local p = game.party:findMember{main=true}
+if not p:isQuestStatus("antimagic", engine.Quest.DONE) then
+newChat{ id="welcome",
+ text = [[#LIGHT_GREEN#*A halfling woman stands before you, clad in dark steel plate.*#WHITE#
+Take the test, then we can talk.]],
+ answers = {
+ {"But.."},
+ }
+}
+return "welcome"
+end
+
+
+
+newChat{ id="welcome",
+ text = [[#LIGHT_GREEN#*A halfling woman stands before you, clad in dark steel plate.*#WHITE#
+I am Protector Myssil. Welcome to Zigur.]],
+ answers = {
+ {"I require all the help I can get, not for my sake but for the town of Derth, to the northeast of here.", jump="save-derth", cond=function(npc, player) local q = player:hasQuest("lightning-overload") return q and q:isCompleted("saved-derth") and not q:isCompleted("tempest-entrance") end},
+ {"Nothing for now. Sorry to have taken your time. Farewell, Protector."},
+ }
+}
+
+newChat{ id="save-derth",
+ text = [[Yes, we have sensed the blight of the eldritch forces there. I have already people to dispel the cloud, but the real threat is not there.
+We know that a Tempest, a powerful Archmage who can control the storms, is responsible for the damage. Those wretched fools from Angolwen will not act. All corrupted!
+So you must act @playername@. I will show you the location of this mage - high in the Daikara mountains.
+Erase him.]],
+ answers = {
+ {"You can count on me, Protector.", action=function(npc, player)
+ player:hasQuest("lightning-overload"):create_entrance()
+ end},
+ }
+}
+
+return "welcome"
diff --git a/game/modules/tome/data/maps/towns/zigur.lua b/game/modules/tome/data/maps/towns/zigur.lua
index 90b1cde618b4658a0fa2fb08aca9f3ed93104ee8..81ddbd16d0da5aa1296f1f85734c417e360eb746 100644
--- a/game/modules/tome/data/maps/towns/zigur.lua
+++ b/game/modules/tome/data/maps/towns/zigur.lua
@@ -33,6 +33,7 @@ quickEntity('+', {show_tooltip=true, name='closed door', display='+', color_r=25
quickEntity('=', {show_tooltip=true, name='lava pit', display='~', color=colors.LIGHT_RED, back_color=colors.RED, always_remember = true, does_block_move = true, image="terrain/lava_floor.png"})
defineTile("?", "OLD_FLOOR")
defineTile(":", "FLOOR")
+defineTile("@", "FLOOR", nil, "PROTECTOR_MYSSIL")
quickEntity("'", {show_tooltip=true, name="Open gates", display="'", color=colors.UMBER, image="terrain/stone_store_open.png"})
quickEntity('1', {show_tooltip=true, name="Trainer", display='1', color=colors.UMBER, chat_faction="zigur", resolvers.chatfeature("zigur-trainer", "zigur"), image="terrain/stone_store_training.png"})
@@ -119,7 +120,7 @@ return [[
~~~~~~~~~~~~~..........~~tt###............tttttttt
~~~~~~~~~~~..............tt###.............ttttttt
~~~~~~~~~~.....#########...###..............tttttt
-~~~~~~~~.......#:::::::#...###..========.....ttttt
+~~~~~~~~.......#:::@:::#...###..========.....ttttt
~~~~~~~~.......#:::::::#...#1#.==??????==....##ttt
~~~~~~~tt......#:##'##:#......==????????==...##ttt
~~~~~~ttt......#:#._.#:#......=??!!??????=...###tt
diff --git a/game/modules/tome/data/maps/wilderness/eyal.lua b/game/modules/tome/data/maps/wilderness/eyal.lua
index 9c5a69198e59acdd9724211b9d537702123dd9ca..699c7a2818069a8cd597801d0fe96c6aa00e7df7 100644
--- a/game/modules/tome/data/maps/wilderness/eyal.lua
+++ b/game/modules/tome/data/maps/wilderness/eyal.lua
@@ -165,6 +165,7 @@ addSpot({45, 28}, "zone-pop", "zigur")
addSpot({32, 23}, "zone-pop", "shertul-fortress")
addSpot({37, 32}, "zone-pop", "halfling-ruins")
addSpot({31, 47}, "zone-pop", "rel-tunnel")
+addSpot({60, 9}, "zone-pop", "tempest-peak")
-- addZone section
addZone({5, 1, 82, 43}, "zonename", "Maj'Eyal")
diff --git a/game/modules/tome/data/maps/zones/tempest-peak-top.lua b/game/modules/tome/data/maps/zones/tempest-peak-top.lua
index 67443165ae70a62ba1e4c5c63374ef08765d70aa..09d40378f62607c5d5caa37c3a2aa2d09ffacace 100644
--- a/game/modules/tome/data/maps/zones/tempest-peak-top.lua
+++ b/game/modules/tome/data/maps/zones/tempest-peak-top.lua
@@ -26,6 +26,9 @@ defineTile(".", "ROCKY_GROUND")
startx = 16
starty = 5
+endx = 10
+endy = 14
+
-- ASCII map section
return [[
diff --git a/game/modules/tome/data/quests/anti-antimagic.lua b/game/modules/tome/data/quests/anti-antimagic.lua
index 8790ec7239a99e4e003578034174c6d5016776f6..30cac59ee398bf032439a51821f0d652d1d6c8c8 100644
--- a/game/modules/tome/data/quests/anti-antimagic.lua
+++ b/game/modules/tome/data/quests/anti-antimagic.lua
@@ -51,10 +51,12 @@ on_grant = function(self, who)
local spot, x, y, m
-- Summon the ziguranth defenders
- spot = game.level:pickSpot{type="arrival", subtype="ziguranth"}
- x, y = util.findFreeGrid(spot.x, spot.y, 5, true, {[engine.Map.ACTOR]=true})
- m = game.zone:makeEntityByName(game.level, "actor", "PROTECTOR_MYSSIL")
- if m and x and y then game.zone:addEntity(game.level, m, "actor", x, y) end
+ for uid, e in pairs(game.level.entities) do
+ if e.define_as == "PROTECTOR_MYSSIL" then
+ e:setTarget(who)
+ break
+ end
+ end
for i = 1, 7 do
spot = game.level:pickSpot{type="arrival", subtype="ziguranth"}
diff --git a/game/modules/tome/data/quests/lightning-overload.lua b/game/modules/tome/data/quests/lightning-overload.lua
index f7a81b522b151a6d586de67abe691066c30989ce..9e3931d5ad451f6559039320b388fbc4bfd38fc6 100644
--- a/game/modules/tome/data/quests/lightning-overload.lua
+++ b/game/modules/tome/data/quests/lightning-overload.lua
@@ -23,11 +23,14 @@ desc = function(self, who)
desc[#desc+1] = "As you came to Derth you saw a huge dark cloud over the small town."
desc[#desc+1] = "When you entered you were greeted by an army of air elementals slaughtering the population."
if self:isCompleted("saved-derth") then
- desc[#desc+1] = " * You have dispatched the elementals but the cloud lingers still. You must find a powerful ally to remove it. There are rumours of a secret town in the blue mountains, to the southwest."
+ desc[#desc+1] = " * You have dispatched the elementals but the cloud lingers still. You must find a powerful ally to remove it. There are rumours of a secret town in the blue mountains, to the southwest. You could also check out the Ziguranth group that is supposed to fight magic."
end
if self:isCompleted("tempest-located") then
desc[#desc+1] = " * You have learned the real threat comes from a rogue Archmage, a Tempest named Urkis. The mages of Angolwen are ready to teleport you there."
end
+ if self:isCompleted("tempest-entrance") then
+ desc[#desc+1] = " * You have learned the real threat comes from a rogue Archmage, a Tempest. You have been shown a secret entrance to his stronghold."
+ end
return table.concat(desc, "\n")
end
@@ -103,6 +106,29 @@ teleport_urkis = function(self)
The storm is raging above your head.]], 400)
end
+create_entrance = function(self)
+ local p = mod.class.Grid.new{
+ show_tooltip=true, always_remember = true,
+ name="Long road to the Tempest Peak",
+ display='>', color=colors.WHITE,
+ notice = true,
+ change_level=1, change_zone="tempest-peak",
+ change_level_check = function()
+ game.turn = game.turn + 5 * game.calendar.HOUR
+ if not game.player:hasQuest("lightning-overload").walked then
+ require("engine.ui.Dialog"):simpleLongPopup("Danger...", [[After an hours long walk you finally reach the end of the way. You are nearly on top of one of the highest peaks you can see.
+The storm is raging above your head.]], 400)
+ game.player:hasQuest("lightning-overload").walked = true
+ end
+ end
+ }
+ p:resolve() p:resolve(nil, true)
+ local level = game.memory_levels["wilderness-1"]
+ local spot = level:pickSpot{type="zone-pop", subtype="tempest-peak"}
+ game.zone:addEntity(level, p, "terrain", spot.x, spot.y)
+ game.player:setQuestStatus(self.id, engine.Quest.COMPLETED, "tempest-entrance")
+end
+
reenter_derth = function(self)
if (self:isCompleted() or self:isEnded()) and not self:isCompleted("restored-derth") then
game.level.map:setShown(1, 1, 1, 1)
diff --git a/game/modules/tome/data/zones/tempest-peak/zone.lua b/game/modules/tome/data/zones/tempest-peak/zone.lua
index e0e5573f20d4b0186de6f8c9104db86d28b28dd1..cd275ec6538bb028d8dd5b75b41526faf56c439e 100644
--- a/game/modules/tome/data/zones/tempest-peak/zone.lua
+++ b/game/modules/tome/data/zones/tempest-peak/zone.lua
@@ -38,7 +38,7 @@ return {
lite_room_chance = 100,
['.'] = "ROCKY_GROUND",
['#'] = "MOUNTAIN_WALL",
- up = "ROCKY_GROUND",
+ up = "UP",
down = "DOWN",
door = "DOOR",
},
@@ -84,4 +84,13 @@ return {
end
},
},
+
+ on_enter = function(lev, old_lev, newzone)
+ if lev == 1 and not game.level.created_way_back and game.player:isQuestStatus("lightning-overload", engine.Quest.COMPLETED, "tempest-entrance") then
+ game.level.created_way_back = true
+ local g = game.zone:makeEntityByName(game.level, "terrain", "ROCKY_UP_WILDERNESS")
+ g.change_level_check = function() game.turn = game.turn + 5 * game.calendar.HOUR end -- Make it take time to travel
+ game.zone:addEntity(game.level, g, "terrain", game.player.x, game.player.y)
+ end
+ end,
}
diff --git a/game/modules/tome/data/zones/town-zigur/npcs.lua b/game/modules/tome/data/zones/town-zigur/npcs.lua
index 3df34c2b90a37b3fffa18929ef3b34d302987eeb..1774bed433a47e6255a851347adb4ffbbcf10eb8 100644
--- a/game/modules/tome/data/zones/town-zigur/npcs.lua
+++ b/game/modules/tome/data/zones/town-zigur/npcs.lua
@@ -70,10 +70,11 @@ newEntity{ base = "BASE_NPC_ELVEN_CASTER", define_as = "GRAND_CORRUPTOR",
load("/data/general/npcs/ziguranth.lua", function(e) if e.rarity then e.rarity, e.ziguranth_rarity = nil, e.rarity end end)
newEntity{ base = "BASE_NPC_ZIGURANTH", define_as = "PROTECTOR_MYSSIL",
name = "Protector Myssil", color=colors.VIOLET, unique = true,
- desc = [[A Halfling ziguranth, clad in dark steel plates. She is *NOT* happy to see you.]],
+ desc = [[A Halfling ziguranth, clad in dark steel plates. She is the current leader of Zigur.]],
female = true, subtype = "halfling",
level_range = {30, nil}, exp_worth = 1,
- rank = 3.5,
+ rank = 4,
+ size_category = 2,
stamina_regen = 40,
max_life = resolvers.rngavg(300, 310), life_rating = 21,
resolvers.equip{
@@ -89,7 +90,7 @@ newEntity{ base = "BASE_NPC_ZIGURANTH", define_as = "PROTECTOR_MYSSIL",
[Talents.T_WEAPON_COMBAT]=4,
[Talents.T_WEAPONS_MASTERY]=4,
[Talents.T_RESOLVE]=5,
- [Talents.T_AURA_OF_SILENCE]=3,
+ [Talents.T_AURA_OF_SILENCE]=4,
[Talents.T_ANTIMAGIC_SHIELD]=5,
[Talents.T_MANA_CLASH]=4,
[Talents.T_ICE_CLAW]=5,
@@ -102,6 +103,8 @@ newEntity{ base = "BASE_NPC_ZIGURANTH", define_as = "PROTECTOR_MYSSIL",
},
resolvers.sustains_at_birth(),
+ can_talk = "myssil",
+
ai = "tactical", ai_state = { talent_in=1, ai_move="move_astar", },
ai_tactic = resolvers.tactic"melee",
resolvers.inscriptions(4, "infusion"),
diff --git a/tiled-maps/eyal2.tmx b/tiled-maps/eyal2.tmx
index 9cbf52d4df61892552b6d62732d91177c9b25bf2..9b95f662bd9e4211fa2447539eadc41c5f284931 100644
--- a/tiled-maps/eyal2.tmx
+++ b/tiled-maps/eyal2.tmx
@@ -540,6 +540,12 @@
<property name="type" value=""zone-pop""/>
</properties>
</object>
+ <object name="Tempest Peak" x="1923" y="291" width="24" height="20">
+ <properties>
+ <property name="subtype" value=""tempest-peak""/>
+ <property name="type" value=""zone-pop""/>
+ </properties>
+ </object>
</objectgroup>
<objectgroup name="addZone#zonenames" width="170" height="100" visible="0">
<object name="Maj'Eyal" x="171" y="56" width="2478" height="1344">
diff --git a/tiled-maps/zigur.tmx b/tiled-maps/zigur.tmx
index 1bbaaa0b5b940adadedf3a8dbb0dcb4484692d00..01fcd99af45968820f6543276a26acaeaf2a6b1f 100644
--- a/tiled-maps/zigur.tmx
+++ b/tiled-maps/zigur.tmx
@@ -125,8 +125,8 @@
</tile>
</tileset>
<layer name="Terrain" width="50" height="50">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3YTWoDMQwFYHcbmFUOEOgl5rrd9gA9TBbtujco3ZWBGITQz5Nle0xo4EGbOlN/Y0txci2lXAdnn5DRhqjj8sgMxwUMd9xJ0GugrhHz1+aQcXiWjOEORBufvSdRh3XNYz4vRhDHqxPUMtvxTZ6vc9UemqXeC9TBe4jmqNf9JT9LDhrPYFkiDqkXWo7j95vyvOaoj/dHLIu2Py2H1tOtOucOq57RtaAOauG9BHFEeskNHBcxUEtkPdC14PPnGeGolp9i10eLoTro6yQHNUYctG54naCOyHpoDmmNUAevfcSh/b11X1l7TKpzq19VQ9QRDbKvsjXivbf3OAe2OpD+i55Repxro/1K80TOWCPW48yc6UDO+BHDszqObBMdnwmH9/ljI5m1Ppn5I46VLK3fM6zk8QzI59qsRfqu5KvoNcHPQ4gBcVBL5j5GetQuvL6nY4Qlu59aHVEL/3/R94yejp51gn4WmOHI9K9ncWTWcYRjNQvqONviebKOVTwRx8qWqMOzjDK9Cck6Ip5eXslBLRlHL1PGUfdYL0fWv7KD3nNv3KqOOv8dsNRxqzpoP7EsdOzZde45qGUjYzZh7OoOyeOdm1ZwIPNEYxlm9ateFr5Gsxze/uqZfweWj0mOP+4ePdEQJwAA
+ <data encoding="base64" compression="zlib">
+ eJzt2E1qAzEMBWB3G5hVDhDoJea63fYAPUwW7bo3KN2VgRiE0M+TZXtMaOBBmzpTf2NLcXItpVwHZ5+Q0Yao4/LIDMcFDHfcSdBroK4R89fmkHF4lozhDkQbn70nUYd1zWM+L0YQx6sT1DLb8U2er3PVHpql3gvUwXuI5qjX/SU/Sw4az2BZIg6pF1qO4/eb8rzmqI/3RyyLtj8th9bTrTrnDque0bWgDmrhvQRxRHrJDRwXMVBLZD3QteDz5xnhqJafYtdHi6E66OskBzVGHLRueJ2gjsh6aA5pjVAHr33Eof29dV9Ze0yqc6tfVUPUEQ2yr7I14r239zgHtjqQ/oueUXqca6P9SvNEzlgj1uPMnOlAzvgRw7M6jmwTHZ8Jh/f5YyOZtT6Z+SOOlSyt3zOs5PEMyOfarEX6ruSr6DXBz0OIAXFQS+Y+RnrULry+p2OEJbufWh1RC/9/0feMno6edYJ+FpjhyPSvZ3Fk1nGEYzUL6jjb4nmyjlU8EcfKlqjDs4wyvQnJOiKeXl7JQS0ZRy9TxlH3WC9H1r+yg95zb9yqjjr/HbDUcas6aD+xLHTs2XXuOahlI2M2YezqDsnjnZtWcCDzRGMZZvWrXha+RrMc3v7qmX8Hlo9Jjj/Sl0NZ
</data>
</layer>
<objectgroup name="addSpot" width="50" height="50">
@@ -215,4 +215,12 @@
</properties>
</object>
</objectgroup>
+ <objectgroup name="Actor" width="50" height="50">
+ <object name="Myssil" x="616" y="165" width="17" height="19">
+ <properties>
+ <property name="display" value="@"/>
+ <property name="value" value=""PROTECTOR_MYSSIL""/>
+ </properties>
+ </object>
+ </objectgroup>
</map>