From ea61a94de3440e96071b861e8a183ceefc933f1d Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Thu, 28 Oct 2010 08:45:21 +0000
Subject: [PATCH] plop
git-svn-id: http://svn.net-core.org/repos/t-engine4@1653 51575b47-30f0-44d4-a5cc-537603b46e54
---
.../tome/data/chats/gates-of-morning-main.lua | 24 +++++++++----------
game/modules/tome/data/chats/istari-end.lua | 2 +-
game/modules/tome/data/chats/istari-fight.lua | 4 ++--
.../tome/data/maps/wilderness/maj-eyal.lua | 2 +-
game/modules/tome/data/quests/mount-doom.lua | 2 +-
.../tome/data/quests/pre-mount-doom.lua | 2 +-
.../tome/data/zones/charred-scar/npcs.lua | 4 ++--
game/modules/tome/data/zones/eruan/grids.lua | 4 ++--
game/modules/tome/data/zones/eruan/npcs.lua | 2 +-
.../tome/data/zones/gorbat-pride/npcs.lua | 4 ++--
.../tome/data/zones/grushnak-pride/npcs.lua | 4 ++--
.../tome/data/zones/high-peak/zone.lua | 2 +-
.../tome/data/zones/rak-shor-pride/npcs.lua | 4 ++--
.../tome/data/zones/vor-pride/npcs.lua | 4 ++--
14 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/game/modules/tome/data/chats/gates-of-morning-main.lua b/game/modules/tome/data/chats/gates-of-morning-main.lua
index 23f32f6ee3..a20f3c97af 100644
--- a/game/modules/tome/data/chats/gates-of-morning-main.lua
+++ b/game/modules/tome/data/chats/gates-of-morning-main.lua
@@ -23,7 +23,7 @@ newChat{ id="welcome",
{"Tell me more about the Gates of Morning.", jump="explain-gates"},
{"I need help in my hunt for clues about the staff.", jump="clues", cond=function(npc, player) return not player:hasQuest("orc-pride") end},
{"I have destroyed the leaders of all the Orc Prides.", jump="prides-dead", cond=function(npc, player) return player:isQuestStatus("orc-pride", engine.Quest.COMPLETED) end},
- {"I am back from Mount Doom, where the orcs took the staff.", jump="mount-doom", cond=function(npc, player) return player:hasQuest("mount-doom") and player:hasQuest("mount-doom"):isCompleted() end},
+ {"I am back from the Charred Scar, where the orcs took the staff.", jump="charred-scar", cond=function(npc, player) return player:hasQuest("charred-scar") and player:hasQuest("charred-scar"):isCompleted() end},
{"Sorry, I have to go!"},
}
}
@@ -75,31 +75,31 @@ The known bastions of the Pride are:
},
}
-newChat{ id="mount-doom",
+newChat{ id="charred-scar",
text = [[I have heard about that; good men lost their lives for this. I hope it was worth it.]],
answers = {
- {"Yes, my lady, they delayed the orcs so that I could get to the heart of the volcano. *#LIGHT_GREEN#Tell her what happened#WHITE#*", jump="mount-doom-success",
- cond=function(npc, player) return player:isQuestStatus("mount-doom", engine.Quest.COMPLETED, "stopped") end,
+ {"Yes, my lady, they delayed the orcs so that I could get to the heart of the volcano. *#LIGHT_GREEN#Tell her what happened#WHITE#*", jump="charred-scar-success",
+ cond=function(npc, player) return player:isQuestStatus("charred-scar", engine.Quest.COMPLETED, "stopped") end,
},
- {"I am afraid I was too late, but I still have some valuable information. *#LIGHT_GREEN#Tell her what happened#WHITE#*", jump="mount-doom-fail",
- cond=function(npc, player) return player:isQuestStatus("mount-doom", engine.Quest.COMPLETED, "not-stopped") end,
+ {"I am afraid I was too late, but I still have some valuable information. *#LIGHT_GREEN#Tell her what happened#WHITE#*", jump="charred-scar-fail",
+ cond=function(npc, player) return player:isQuestStatus("charred-scar", engine.Quest.COMPLETED, "not-stopped") end,
},
},
}
-newChat{ id="mount-doom-success",
- text = [[Blue Wizards? I have never heard of them. There were rumours about a new master of the Pride, but it seems they have two.
+newChat{ id="charred-scar-success",
+ text = [[Sorcerers? I have never heard of them. There were rumours about a new master of the Pride, but it seems they have two.
Thank you for everything. You must continue your hunt now that you know what to look for.]],
answers = {
- {"I will avenge your men.", action=function(npc, player) player:setQuestStatus("mount-doom", engine.Quest.DONE) end}
+ {"I will avenge your men.", action=function(npc, player) player:setQuestStatus("charred-scar", engine.Quest.DONE) end}
},
}
-newChat{ id="mount-doom-fail",
- text = [[Blue Wizards? I have never heard of them. There were rumours about a new master of the Pride, but it seems they have two.
+newChat{ id="charred-scar-fail",
+ text = [[Sorcerers? I have never heard of them. There were rumours about a new master of the Pride, but it seems they have two.
I am afraid with the power they gained today they will be even harder to stop, but we do not have a choice.]],
answers = {
- {"I will avenge your men.", action=function(npc, player) player:setQuestStatus("mount-doom", engine.Quest.DONE) end}
+ {"I will avenge your men.", action=function(npc, player) player:setQuestStatus("charred-scar", engine.Quest.DONE) end}
},
}
diff --git a/game/modules/tome/data/chats/istari-end.lua b/game/modules/tome/data/chats/istari-end.lua
index 0c1a9e5713..a197d54696 100644
--- a/game/modules/tome/data/chats/istari-end.lua
+++ b/game/modules/tome/data/chats/istari-end.lua
@@ -19,7 +19,7 @@
local function void_portal_open(npc, player)
-- Mount doom was succesfull
- if player:hasQuest("mount-doom") and player:hasQuest("mount-doom"):isCompleted("stopped") then return false end
+ if player:hasQuest("charred-scar") and player:hasQuest("charred-scar"):isCompleted("stopped") then return false end
return true
end
local function aeryn_alive(npc, player)
diff --git a/game/modules/tome/data/chats/istari-fight.lua b/game/modules/tome/data/chats/istari-fight.lua
index cb633356d5..a58b7e3e1a 100644
--- a/game/modules/tome/data/chats/istari-fight.lua
+++ b/game/modules/tome/data/chats/istari-fight.lua
@@ -19,12 +19,12 @@
local function void_portal_open(npc, player)
-- Mount doom was succesfull
- if player:hasQuest("mount-doom") and player:hasQuest("mount-doom"):isCompleted("stopped") then return false end
+ if player:hasQuest("charred-scar") and player:hasQuest("charred-scar"):isCompleted("stopped") then return false end
return true
end
local function aeryn_alive(npc, player)
-- Mount doom was succesfull
- if player:hasQuest("mount-doom") and player:hasQuest("mount-doom"):isCompleted("stopped") then return true end
+ if player:hasQuest("charred-scar") and player:hasQuest("charred-scar"):isCompleted("stopped") then return true end
-- Spared aeryn
return player:isQuestStatus("high-peak", engine.Quest.COMPLETED, "spared-aeryn")
diff --git a/game/modules/tome/data/maps/wilderness/maj-eyal.lua b/game/modules/tome/data/maps/wilderness/maj-eyal.lua
index 084f472b2c..d458e67562 100644
--- a/game/modules/tome/data/maps/wilderness/maj-eyal.lua
+++ b/game/modules/tome/data/maps/wilderness/maj-eyal.lua
@@ -52,7 +52,7 @@ quickEntity('D', {always_remember = true, show_tooltip=true, name="A path into t
quickEntity('E', {always_remember = true, show_tooltip=true, name="A mysterious hole in the beach", display='>', color={r=200, g=255, b=55}, notice = true, change_level=1, change_zone="sandworm-lair"})
quickEntity('F', {always_remember = true, show_tooltip=true, name="The entry to the old tower of Tol Falas",display='>', color={r=0, g=255, b=255}, notice = true, change_level=1, change_zone="tol-falas"})
quickEntity('G', {always_remember = true, show_tooltip=true, name="Passageway into Daikara",display='>', color=colors.UMBER, notice = true, change_level=1, change_zone="daikara"})
-quickEntity('H', {always_remember = true, show_tooltip=true, name='Charred Scar', display='>', color=colors.RED, back_color=colors.LIGHT_DARK, image="terrain/volcano1.png", notice = true, change_level=1, change_zone="mount-doom"})
+quickEntity('H', {always_remember = true, show_tooltip=true, name='Charred Scar', display='>', color=colors.RED, back_color=colors.LIGHT_DARK, image="terrain/volcano1.png", notice = true, change_level=1, change_zone="charred-scar"})
quickEntity('1', {always_remember = true, show_tooltip=true, name="Derth (Town)", desc="A quiet town at the crossroads of the north", display='*', color={r=255, g=255, b=255}, back_color=colors.DARK_GREEN, image="terrain/town1.png", notice = true, change_level=1, change_zone="town-derth"})
quickEntity('2', {always_remember = true, show_tooltip=true, name="Last Hope (Town)", desc="Capital city of the Allied Kingdoms ruled by King Tolak", display='*', color={r=255, g=255, b=255}, back_color=colors.DARK_GREEN, image="terrain/town1.png", notice = true, change_level=1, change_zone="town-last-hope"})
diff --git a/game/modules/tome/data/quests/mount-doom.lua b/game/modules/tome/data/quests/mount-doom.lua
index 90b13714b2..a9225ce114 100644
--- a/game/modules/tome/data/quests/mount-doom.lua
+++ b/game/modules/tome/data/quests/mount-doom.lua
@@ -63,5 +63,5 @@ start_fyrk = function(self)
game.logPlayer(game.player, "#VIOLET#The Blue Wizards flee through a portal, as you prepare to follow them a huge faeros appears to block the way.")
world:gainAchievement("MOUNT_DOOM_SUCCESS", game.player)
end
- game.player:setQuestStatus("mount-doom", engine.Quest.COMPLETED)
+ game.player:setQuestStatus("charred-scar", engine.Quest.COMPLETED)
end
diff --git a/game/modules/tome/data/quests/pre-mount-doom.lua b/game/modules/tome/data/quests/pre-mount-doom.lua
index 6110aed729..4d8b07d50c 100644
--- a/game/modules/tome/data/quests/pre-mount-doom.lua
+++ b/game/modules/tome/data/quests/pre-mount-doom.lua
@@ -27,7 +27,7 @@ end
on_grant = function(self, who)
local aeryn = {name="High Sun Paladin Aeryn"}
- local chat = engine.Chat.new("pre-mount-doom", aeryn, who)
+ local chat = engine.Chat.new("pre-charred-scar", aeryn, who)
chat:invoke()
-- Reveal entrance
diff --git a/game/modules/tome/data/zones/charred-scar/npcs.lua b/game/modules/tome/data/zones/charred-scar/npcs.lua
index c356ebe7b4..4a20221d3f 100644
--- a/game/modules/tome/data/zones/charred-scar/npcs.lua
+++ b/game/modules/tome/data/zones/charred-scar/npcs.lua
@@ -206,8 +206,8 @@ newEntity{
on_acquire_target = function(self, who)
self:doEmote("Damn you, you only postpone your death! Fyrk!", 60)
- game.player:hasQuest("mount-doom"):setStatus(engine.Quest.COMPLETED, "stopped")
- game.player:hasQuest("mount-doom"):start_fyrk()
+ game.player:hasQuest("charred-scar"):setStatus(engine.Quest.COMPLETED, "stopped")
+ game.player:hasQuest("charred-scar"):start_fyrk()
end,
}
diff --git a/game/modules/tome/data/zones/eruan/grids.lua b/game/modules/tome/data/zones/eruan/grids.lua
index 7dc0dcdf3f..b22d977fa6 100644
--- a/game/modules/tome/data/zones/eruan/grids.lua
+++ b/game/modules/tome/data/zones/eruan/grids.lua
@@ -36,7 +36,7 @@ This one seems to go to the west, to Mount Doom, in the land of Mordor. A fiery
orb_portal = {
change_level = 1,
- change_zone = "mount-doom",
+ change_zone = "charred-scar",
message = "#VIOLET#You enter the swirling portal while it fades away and in the blink of an eye you set foot on hellish land, the heart of a volcano...",
on_preuse = function(self, who)
-- Find all portals and deactivate them
@@ -46,7 +46,7 @@ This one seems to go to the west, to Mount Doom, in the land of Mordor. A fiery
end end end
end,
on_use = function(self, who)
- who:setQuestStatus("pre-mount-doom", engine.Quest.DONE)
+ who:setQuestStatus("pre-charred-scar", engine.Quest.DONE)
end,
},
}
diff --git a/game/modules/tome/data/zones/eruan/npcs.lua b/game/modules/tome/data/zones/eruan/npcs.lua
index bf933b1b9d..739cd5180a 100644
--- a/game/modules/tome/data/zones/eruan/npcs.lua
+++ b/game/modules/tome/data/zones/eruan/npcs.lua
@@ -65,5 +65,5 @@ newEntity{ define_as = "SUN_PALADIN_GUREN",
},
resolvers.sustains_at_birth(),
- can_talk = "pre-mount-doom-eruan",
+ can_talk = "pre-charred-scar-eruan",
}
diff --git a/game/modules/tome/data/zones/gorbat-pride/npcs.lua b/game/modules/tome/data/zones/gorbat-pride/npcs.lua
index 67cfe3d3de..237b8b93ad 100644
--- a/game/modules/tome/data/zones/gorbat-pride/npcs.lua
+++ b/game/modules/tome/data/zones/gorbat-pride/npcs.lua
@@ -87,8 +87,8 @@ newEntity{ base="BASE_NPC_ORC_GORBAT", define_as = "GORBAT",
on_die = function(self, who)
game.player:resolveSource():setQuestStatus("orc-pride", engine.Quest.COMPLETED, "gorbat")
- if not game.player:hasQuest("pre-mount-doom") then
- game.player:grantQuest("pre-mount-doom")
+ if not game.player:hasQuest("pre-charred-scar") then
+ game.player:grantQuest("pre-charred-scar")
end
end,
}
diff --git a/game/modules/tome/data/zones/grushnak-pride/npcs.lua b/game/modules/tome/data/zones/grushnak-pride/npcs.lua
index 75dd0b9170..227850ac98 100644
--- a/game/modules/tome/data/zones/grushnak-pride/npcs.lua
+++ b/game/modules/tome/data/zones/grushnak-pride/npcs.lua
@@ -89,8 +89,8 @@ newEntity{ base="BASE_NPC_ORC_GRUSHNAK", define_as = "GRUSHNAK",
on_die = function(self, who)
game.player:resolveSource():setQuestStatus("orc-pride", engine.Quest.COMPLETED, "grushnak")
- if not game.player:hasQuest("pre-mount-doom") then
- game.player:grantQuest("pre-mount-doom")
+ if not game.player:hasQuest("pre-charred-scar") then
+ game.player:grantQuest("pre-charred-scar")
end
end,
}
diff --git a/game/modules/tome/data/zones/high-peak/zone.lua b/game/modules/tome/data/zones/high-peak/zone.lua
index 1fb3355883..7c31d2e2c5 100644
--- a/game/modules/tome/data/zones/high-peak/zone.lua
+++ b/game/modules/tome/data/zones/high-peak/zone.lua
@@ -64,7 +64,7 @@ return {
-- if we failed at mount doom (or did not do it at all) the gate of morning is destroyed and Aeryn turned to the service of the istari
if level.level == 15 then
- local mtdm = game.player:hasQuest("mount-doom")
+ local mtdm = game.player:hasQuest("charred-scar")
if not mtdm or mtdm:isCompleted("not-stopped") then
game.player:hasQuest("high-peak"):failed_mount_doom(level)
end
diff --git a/game/modules/tome/data/zones/rak-shor-pride/npcs.lua b/game/modules/tome/data/zones/rak-shor-pride/npcs.lua
index bed26fefb9..a19e7eb52f 100644
--- a/game/modules/tome/data/zones/rak-shor-pride/npcs.lua
+++ b/game/modules/tome/data/zones/rak-shor-pride/npcs.lua
@@ -81,8 +81,8 @@ newEntity{ base="BASE_NPC_ORC_RAK_SHOR", define_as = "RAK_SHOR",
on_die = function(self, who)
game.player:resolveSource():setQuestStatus("orc-pride", engine.Quest.COMPLETED, "rak-shor")
- if not game.player:hasQuest("pre-mount-doom") then
- game.player:grantQuest("pre-mount-doom")
+ if not game.player:hasQuest("pre-charred-scar") then
+ game.player:grantQuest("pre-charred-scar")
end
end,
}
diff --git a/game/modules/tome/data/zones/vor-pride/npcs.lua b/game/modules/tome/data/zones/vor-pride/npcs.lua
index 2b94155443..aa3a453611 100644
--- a/game/modules/tome/data/zones/vor-pride/npcs.lua
+++ b/game/modules/tome/data/zones/vor-pride/npcs.lua
@@ -78,8 +78,8 @@ newEntity{ base="BASE_NPC_ORC_VOR", define_as = "VOR",
on_die = function(self, who)
game.player:resolveSource():setQuestStatus("orc-pride", engine.Quest.COMPLETED, "vor")
- if not game.player:hasQuest("pre-mount-doom") then
- game.player:grantQuest("pre-mount-doom")
+ if not game.player:hasQuest("pre-charred-scar") then
+ game.player:grantQuest("pre-charred-scar")
end
end,
}
--
GitLab