summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/re/item_db.conf3
-rw-r--r--npc/003-1-1/yetiking.txt2
-rw-r--r--npc/items/shovel.txt2
3 files changed, 4 insertions, 3 deletions
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 189b65e11..ac7fc5892 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -3106,7 +3106,8 @@ item_db: (
if (!ShovelQuests_DungeonX) {
callfunc "shovel_genranddungeon";
}
- dispbottom l("A dungeon is burried in @@, (@@, @@)", ShovelQuests_DungeonMAP$, ShovelQuests_DungeonX, ShovelQuests_DungeonY);
+ .@c$ = callfunc("shovel_getcity", ShovelQuests_DungeonMAP$);
+ dispbottom l("A dungeon is burried in @@, (@@, @@)", .@c$, ShovelQuests_DungeonX, ShovelQuests_DungeonY);
">
},
{
diff --git a/npc/003-1-1/yetiking.txt b/npc/003-1-1/yetiking.txt
index 0b54d4e4e..e9e48d6b5 100644
--- a/npc/003-1-1/yetiking.txt
+++ b/npc/003-1-1/yetiking.txt
@@ -122,7 +122,7 @@ OnSummonTalk:
goto L_Die;
if (@menu == 3)
close;
- if (BaseLevel < 35 && !countitem(MirrorLakeArmor)) {
+ if (BaseLevel < 35 && !countitem(MirrorLakeArmor) && !REBIRTH) {
mesn l("Dah Yeti King!!");
mesq l("You? Have you ever looked in the mirror? You're not even level 35. Begone.");
close;
diff --git a/npc/items/shovel.txt b/npc/items/shovel.txt
index ed1f464c5..7a18fa411 100644
--- a/npc/items/shovel.txt
+++ b/npc/items/shovel.txt
@@ -535,7 +535,7 @@ function script shovel_genranddungeon {
// Success
if (checkcell(.@m$, .@x, .@y, cell_chkpass)) {
shovel_addquest(.@m$, .@x, .@y, "shovel_randomdungeon");
- ShovelQuests_DungeonMAP$=shovel_getcity(.@m$);
+ ShovelQuests_DungeonMAP$=.@m$;
ShovelQuests_DungeonX=.@x;
ShovelQuests_DungeonY=.@y;
}