diff options
-rw-r--r-- | npc/034-4/intro.txt | 19 | ||||
-rw-r--r-- | npc/034-4/storage.txt | 10 |
2 files changed, 22 insertions, 7 deletions
diff --git a/npc/034-4/intro.txt b/npc/034-4/intro.txt index 4f1f7a1b5..f9fb3d93f 100644 --- a/npc/034-4/intro.txt +++ b/npc/034-4/intro.txt @@ -42,7 +42,7 @@ OnTimer2500: end; OnTimer6000: - unittalk(.luvia, "If it isn't the so-called \"%s\"!", .pn$); + unittalk(.luvia, sprintf("If it isn't the so-called \"%s\"!", .pn$)); end; OnTimer9500: @@ -65,13 +65,14 @@ OnTimer20000: .@pi = getmapusers(.mp$) + 1; areamonster(.mp$, 45, 40, 54, 45, strmobinfo(1, Scar), Scar, .@pi); unittalk(.luvia, "HAHAHahahaha!"); - unitwalk(.luvia, 50, 29); + unitwalk(.luvia, 51, 38); end; OnTimer24000: .@pi = getmapusers(.mp$) + 1; monster(.mp$, 37, 33, strmobinfo(1, Scar), Scar, .@pi); monster(.mp$, 43, 52, strmobinfo(1, Scar), Scar, .@pi); + unitwalk(.luvia, 50, 29); end; OnTimer28000: @@ -91,13 +92,18 @@ OnTimer50000: monster(.mp$, 37, 33, strmobinfo(1, Scar), Scar, .@pi * 3 / 2); end; +// 1.35 minutes (should be OK?) + OnTimer150000: .@pi = getmapusers(.mp$) + 1; monster(.mp$, 50, 29, strmobinfo(1, Scar), Scar, .@pi * 3 / 2); monster(.mp$, 43, 52, strmobinfo(1, Scar), Scar, .@pi); monster(.mp$, 37, 33, strmobinfo(1, Scar), Scar, .@pi); + monster(.mp$, 43, 52, strmobinfo(1, BlackMamba), BlackMamba, 1); end; +// 2.5 minutes (too much?) + OnTimer300000: .@pi = getmapusers(.mp$) + 1; monster(.mp$, 50, 29, strmobinfo(1, Scar), Scar, .@pi * 3 / 2); @@ -106,6 +112,8 @@ OnTimer300000: monster(.mp$, 43, 52, strmobinfo(1, Terranite), Terranite, 1+(.@pi/2)); end; +// 3 minutes is too much? + OnTimer480000: .@pi = getmapusers(.mp$) + 1; monster(.mp$, 50, 29, strmobinfo(1, Scar), Scar, 1+(.@pi/2)); @@ -116,6 +124,8 @@ OnTimer480000: monster(.mp$, 37, 33, strmobinfo(1, AzulSkullSlime), AzulSkullSlime, .@pi); end; +// +2 minutes + OnTimer540000: .@pi = getmapusers(.mp$) + 1; monster(.mp$, 50, 29, strmobinfo(1, Terranite), Terranite, .@pi); @@ -123,6 +133,11 @@ OnTimer540000: monster(.mp$, 37, 33, strmobinfo(1, BlackMamba), BlackMamba, .@pi + 1); end; +// +1 minute + +// Bypass, or it'll take... a while +OnTimer40000: + if (!$@GM_OVERRIDE) end; OnTimer600000: .@pi = getmapusers(.mp$) + 1; monster(.mp$, 50, 29, strmobinfo(1, GoboBear), GoboBear, 1+(.@pi/2)); diff --git a/npc/034-4/storage.txt b/npc/034-4/storage.txt index 3e99e54ef..37082fb4f 100644 --- a/npc/034-4/storage.txt +++ b/npc/034-4/storage.txt @@ -10,7 +10,7 @@ OnTouch: if (instance_id() < 0 || getcharid(1) < 1) end; GeminiCheck(11); .@p=getcharid(1); - if ($@VALIA_STATUS[.@p] < 13) { + if ($@VALIA_STATUS[.@p] < 12) { dispbottom l("Uh? I can't pass. I wonder why, maybe I need to wait?"); end; } @@ -18,10 +18,10 @@ OnTouch: dispbottom l("I should defeat all mobs before passing."); end; } - if (mobcount(getmap(), "all") <= 0 && $@VALIA_STATUS[.@p] == 11) { - $@VALIA_STATUS[.@p]=12; + if (mobcount(getmap(), "all") <= 0 && $@VALIA_STATUS[.@p] == 12) { + $@VALIA_STATUS[.@p]=13; } - if ($@VALIA_STATUS[.@p] >= 12) { + if ($@VALIA_STATUS[.@p] >= 13) { slide 83, 58; } end; @@ -74,7 +74,7 @@ OnTimer13000: OnTimer16500: - unittalk(.luvia, "Show me of what you are made of, %s!", .pn$); + unittalk(.luvia, sprintf("Show me of what you are made of, %s!", .pn$)); .@pi = getmapusers(.mp$) + 2; monster(.mp$, 44, 78, strmobinfo(1, Scar), Scar, .@pi); end; |