From 644c96c15845b66690edb5e3596f201b82ced2cf Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Wed, 10 Aug 2011 16:39:01 +0000
Subject: [PATCH] If Aeryn is killed before the endgame she will not be there
to help
git-svn-id: http://svn.net-core.org/repos/t-engine4@4096 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Actor.lua | 1 +
game/modules/tome/class/GameState.lua | 13 +++++++++++++
game/modules/tome/data/chats/sorcerer-fight.lua | 2 ++
game/modules/tome/data/quests/high-peak.lua | 10 ++++++----
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index e6349e392b..534bba01e0 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -1347,6 +1347,7 @@ function _M:die(src)
if self.rank > 3 then
game.state:bossKilled(self.rank)
end
+ if self.unique then game.state:registerUniqueDeath(self) end
if self.on_death_lore then game.player:learnLore(self.on_death_lore) end
diff --git a/game/modules/tome/class/GameState.lua b/game/modules/tome/class/GameState.lua
index d98c6494d7..c7fab1fa4d 100644
--- a/game/modules/tome/class/GameState.lua
+++ b/game/modules/tome/class/GameState.lua
@@ -31,6 +31,7 @@ function _M:init(t, no_default)
self.allow_backup_guardians = {}
self.world_artifacts_pool = {}
+ self.unique_death = {}
self.boss_killed = 0
self.stores_restock = 1
self.east_orc_patrols = 4
@@ -47,6 +48,17 @@ function _M:bossKilled(rank)
self.boss_killed = self.boss_killed + 1
end
+--- Sets unique as dead
+function _M:registerUniqueDeath(u)
+ if u.randboss then return end
+ self.unique_death[u.name] = true
+end
+
+--- Is unique dead?
+function _M:isUniqueDead(name)
+ return self.unique_death[name]
+end
+
--- Allow dropping the rod of recall
function _M:allowRodRecall(v)
if v == nil then return self.allow_drop_recall end
@@ -1288,6 +1300,7 @@ function _M:createRandomBoss(base, data)
local name = ngd:generate()
b.name = name.." the "..b.name
b.unique = b.name
+ b.randboss = true
local boss_id = "RND_BOSS_"..b.name:upper():gsub("[^A-Z]", "_")
b.define_as = boss_id
b.color = colors.VIOLET
diff --git a/game/modules/tome/data/chats/sorcerer-fight.lua b/game/modules/tome/data/chats/sorcerer-fight.lua
index 98aa8354b7..31a324d598 100644
--- a/game/modules/tome/data/chats/sorcerer-fight.lua
+++ b/game/modules/tome/data/chats/sorcerer-fight.lua
@@ -23,6 +23,8 @@ local function void_portal_open(npc, player)
return true
end
local function aeryn_alive(npc, player)
+ if game.state:isUniqueDead("High Sun Paladin Aeryn") then return false end
+
-- Charred scar was successful
if player:hasQuest("charred-scar") and player:hasQuest("charred-scar"):isCompleted("stopped") then return true end
diff --git a/game/modules/tome/data/quests/high-peak.lua b/game/modules/tome/data/quests/high-peak.lua
index c2641e49b8..c54715cb24 100644
--- a/game/modules/tome/data/quests/high-peak.lua
+++ b/game/modules/tome/data/quests/high-peak.lua
@@ -93,10 +93,12 @@ function end_end_combat(self)
end
function failed_charred_scar(self, level)
- local aeryn = game.zone:makeEntityByName(level, "actor", "FALLEN_SUN_PALADIN_AERYN")
- game.zone:addEntity(level, aeryn, "actor", level.default_down.x, level.default_down.y)
- game.logPlayer(game.player, "#LIGHT_RED#As you enter the level you hear a familiar voice.")
- game.logPlayer(game.player, "#LIGHT_RED#Fallen Sun Paladin Aeryn: '%s YOU BROUGHT ONLY DESTRUCTION TO THE SUNWALL! YOU WILL PAY!'", game.player.name:upper())
+ if not game.state:isUniqueDead("High Sun Paladin Aeryn") then
+ local aeryn = game.zone:makeEntityByName(level, "actor", "FALLEN_SUN_PALADIN_AERYN")
+ game.zone:addEntity(level, aeryn, "actor", level.default_down.x, level.default_down.y)
+ game.logPlayer(game.player, "#LIGHT_RED#As you enter the level you hear a familiar voice.")
+ game.logPlayer(game.player, "#LIGHT_RED#Fallen Sun Paladin Aeryn: '%s YOU BROUGHT ONLY DESTRUCTION TO THE SUNWALL! YOU WILL PAY!'", game.player.name:upper())
+ end
game:onLevelLoad("wilderness-1", function(zone, level)
local spot = level:pickSpot{type="zone-pop", subtype="ruined-gates-of-morning"}
--
GitLab