summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--world/map/npc/069-2/wizard.txt2
-rw-r--r--world/map/npc/annuals/fathertime.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/world/map/npc/069-2/wizard.txt b/world/map/npc/069-2/wizard.txt
index 5bb6f4e1..d9d0464a 100644
--- a/world/map/npc/069-2/wizard.txt
+++ b/world/map/npc/069-2/wizard.txt
@@ -137,7 +137,7 @@ L_Doomsday:
mes "\"...The Doomsday was a fierce battle. If you go there alone, you definitely will die. You should make a party and bring them all here, then I'll consider helping you.\"";
next;
mes "[Rodium]";
- mes "\"##1##BBut... not yet. The time wheel is broken again! Oh dear, these things happen, but I guess that to see the past... You must wait for the future...##b##0\"";
+ mes "\"##1##BBut... not yet. The time wheel is broken again! Oh dear, these things happen, so I guess that to see the past... You must wait for the future...##b##0\"";
if (debug) goto L_Warp;
if (GM >= G_EVENT) goto L_Warp;
goto L_Menu2;
diff --git a/world/map/npc/annuals/fathertime.txt b/world/map/npc/annuals/fathertime.txt
index 91bbec65..fe9fc621 100644
--- a/world/map/npc/annuals/fathertime.txt
+++ b/world/map/npc/annuals/fathertime.txt
@@ -82,6 +82,8 @@ L_Friday:
end;
L_Pirate:
+ if (gettime(5) != -1)
+ goto L_Die;
set $@BLANC, (getusers(1) / 4) + 1;
areamonster "001-1", 20, 20, 120, 120, "Blanc's Minion", 1121, $@BLANC, "#HolidayConfig::OnLameShield";
areamonster "002-1", 20, 20, 120, 120, "Blanc's Minion", 1119, $@BLANC, "#HolidayConfig::OnLameShield";