From 017eaa45d40acbe363a094ed3659233829a7367a Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Sun, 10 Jan 2016 12:29:55 +0100
Subject: [PATCH] Ritch Hive Mother is correctly set as female Warn player that
the exploratory farportal is broken even if there is less than 45 energy
---
game/modules/tome/data/zones/ritch-tunnels/npcs.lua | 2 +-
game/modules/tome/data/zones/shertul-fortress/grids.lua | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/game/modules/tome/data/zones/ritch-tunnels/npcs.lua b/game/modules/tome/data/zones/ritch-tunnels/npcs.lua
index efec324e93..6264f7dcc2 100644
--- a/game/modules/tome/data/zones/ritch-tunnels/npcs.lua
+++ b/game/modules/tome/data/zones/ritch-tunnels/npcs.lua
@@ -96,7 +96,7 @@ newEntity{ base = "BASE_NPC_RITCH_REL",
-- Screw it just die, die, die
newEntity{ base = "BASE_NPC_RITCH_REL", define_as = "HIVE_MOTHER",
- unique = true,
+ unique = true, female = true,
name = "Ritch Great Hive Mother", image = "npc/insect_ritch_ritch_hive_mother.png",
display = "I", color=colors.VIOLET,
desc = [[This huge ritch seems to be the mother of all those here. Her sharp, fiery, claws dart toward you!]],
diff --git a/game/modules/tome/data/zones/shertul-fortress/grids.lua b/game/modules/tome/data/zones/shertul-fortress/grids.lua
index a6cda58f20..713d043da1 100644
--- a/game/modules/tome/data/zones/shertul-fortress/grids.lua
+++ b/game/modules/tome/data/zones/shertul-fortress/grids.lua
@@ -141,8 +141,8 @@ It should automatically create a portal back, but it might not be near your arri
local Dialog = require "engine.ui.Dialog"
local q = who:hasQuest("shertul-fortress")
if not q then Dialog:simplePopup("Exploratory Farportal", "The farportal seems to be inactive") return end
- if not q:exploratory_energy(true) then Dialog:simplePopup("Exploratory Farportal", "The fortress does not have enough energy to power a trip through the portal.") return end
if q:isCompleted("farportal-broken") then Dialog:simplePopup("Exploratory Farportal", "The farportal is broken and will not be usable anymore.") return end
+ if not q:exploratory_energy(true) then Dialog:simplePopup("Exploratory Farportal", "The fortress does not have enough energy to power a trip through the portal.") return end
Dialog:yesnoPopup("Exploratory Farportal", "Do you want to travel in the farportal? You cannot know where you will end up.", function(ret) if ret then
if self:checkSpecialLocation(who, q) then return end
--
GitLab