summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2022-04-14 17:06:29 -0300
committerJesusaves <cpntb1@ymail.com>2022-04-14 17:06:29 -0300
commit18fb4177bb7e9ebbba2d73ab0a5a24b7d0c180b1 (patch)
treec21106fe29cca4820fce985950da1ce83afe7583 /world/map/npc
parentc1cf5542ef7ef899ee596bcdd2b9f84e8bf4e625 (diff)
downloadserverdata-18fb4177bb7e9ebbba2d73ab0a5a24b7d0c180b1.tar.gz
serverdata-18fb4177bb7e9ebbba2d73ab0a5a24b7d0c180b1.tar.bz2
serverdata-18fb4177bb7e9ebbba2d73ab0a5a24b7d0c180b1.tar.xz
serverdata-18fb4177bb7e9ebbba2d73ab0a5a24b7d0c180b1.zip
Fix the crash
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/functions/global_event_handler.txt1
-rw-r--r--world/map/npc/magic/_import.txt1
-rw-r--r--world/map/npc/magic/event-alonsoalonsy.txt137
3 files changed, 0 insertions, 139 deletions
diff --git a/world/map/npc/functions/global_event_handler.txt b/world/map/npc/functions/global_event_handler.txt
index 8497ef29..2743d9f3 100644
--- a/world/map/npc/functions/global_event_handler.txt
+++ b/world/map/npc/functions/global_event_handler.txt
@@ -34,7 +34,6 @@ OnPCDieEvent:
addtimer 0, "Magic Timer::OnClear"; // reset magic block on death
callfunc "SpawnGhost";
callfunc "MiriamExpire"; // force the speed skill quest to expire
- callfunc "DoomsdayAct5"; // Doomsday Event Act 5
set @killerrid, 0; // reset killer rid
end;
diff --git a/world/map/npc/magic/_import.txt b/world/map/npc/magic/_import.txt
index a106c9f7..c3cd11ec 100644
--- a/world/map/npc/magic/_import.txt
+++ b/world/map/npc/magic/_import.txt
@@ -43,6 +43,5 @@ npc: npc/magic/level2-make-short-tanktop.txt
npc: npc/magic/level2-make-tanktop.txt
npc: npc/magic/level2-make-shirt.txt
npc: npc/magic/level3-necromancy.txt
-npc: npc/magic/event-alonsoalonsy.txt
npc: npc/magic/event-summon-managuardian.txt
npc: npc/magic/event-summon-manatyrant.txt
diff --git a/world/map/npc/magic/event-alonsoalonsy.txt b/world/map/npc/magic/event-alonsoalonsy.txt
deleted file mode 100644
index 04f5db02..00000000
--- a/world/map/npc/magic/event-alonsoalonsy.txt
+++ /dev/null
@@ -1,137 +0,0 @@
-// #alonsialonso
-// Replacement of Easter 2010 spell
-// Known as "World Shift Spell"
-//
-// Variables:
-// @alonso -> Nods to DoomsdayAct5() that you'll pay in petals
-
--|script|alonsialonso|32767
-{
- if (call("magic_checks", 1)) end;
- callfunc "magic_exp";
-
- // Not during Act 5 of Doomsday
- if ($DOOMSDAY != 3) end;
-
- // Rule 1: Mushroom Spot
- if (isin("057-1", 125, 62, 127, 64))
- goto L_ShroomRule;
-
- // Rule 2: Underworld Chapel
- if (isin("070-1", 134, 30, 134, 30))
- goto L_ChapelRule;
-
- // Rule 3: Tulimshar MMVI
- //if (isin("003-1", 42, 92, 46, 95))
- // goto L_TulimRule;
-
- // General rule: Simulate death
- if (countitem("DarkPetal"))
- goto L_EmulateDeath;
-
- message strcharinfo(0), "You cannot shift worlds at this time.";
- end;
-
-//////////////////////////////////////////////////////
-L_ShroomRule:
- if (!$@halloween_time) end;
- if (!$DOOMSDAY_TWARP) end;
- if ($DOOMSDAY_TJANDE == 1) end;
-
- mes ".:: Eternal Seals Gate ::.";
- mes "";
- mes "One of the many (?) passages leading to the Underworld.";
- mes "During halloween, it is weakened enough to allow beings to cross.";
- mes "Perhaps it could be widened?";
- next;
- menu
- "Leave", L_Close,
- "[Dark Magic] Check Status", L_ShroomCheck,
- "[Dangerous] Try to cross", L_ShroomCross;
-
-L_ShroomCheck:
- if (getskilllv(SKILL_MAGIC_DARK) > 0)
- mes "Status: "+if_then_else($DOOMSDAY_CNT2 < 150,
- "##1Insufficient##0", "##2Sufficient##0")+
- if_then_else(getskilllv(SKILL_MAGIC_DARK) > 1,
- " ("+($DOOMSDAY_CNT2*100/150)+" %)", "");
- else
- mes "Status: ##8Unknown##0";
- close;
-
-L_ShroomCross:
- if ($DOOMSDAY_CNT2 < 150)
- goto L_FailCross;
- if (Hp < 1)
- close;
-
- // Warp you to Underworld
- warp "070-1", 30, 92;
- message strcharinfo(0), "World Shift : Shifted to Underworld (Area 70)";
- misceffect FX_PENTAGRAM_BUILDUP, strcharinfo(0);
- close;
-
-//////////////////////////////////////////////////////
-L_ChapelRule:
- if ($DOOMSDAY_TJANDE == 1) end;
- if (!$@halloween_time) end;
-
- mes ".:: Eternal Seals Gate ::.";
- mes "";
- mes "This chapel is clearly unlocked.";
- mes "The lock seems to have been removed ##BOn purpose, from the outside.##b";
- mes "This is probably where Tormenta lives.";
- next;
- mes "##9Warning: This is the Underworld and it may defy common logic.";
- mes "Are you ready?##0";
- mes "##1Cost: 1x [@@666|@@]";
- next;
- menu
- "Cancel", L_Close,
- "Open the gate!", L_GateCheck;
-
-L_GateCheck:
- if (!(countitem("BlackRose")))
- close;
-
- close2;
- misceffect FX_PENTAGRAM_BUILDUP, strcharinfo(0);
- addtimer 6000, "alonsialonso::OnChapelCross";
- end;
-
-OnChapelCross:
- if (Hp < 1)
- end;
- if (!(countitem("BlackRose")))
- end;
-
- // Payment Execution
- delitem "BlackRose", 1;
- getitem "DarkPetal", 1;
-
- // Warp you to Tulimshar MMVI
- warp "003-1", 142, 22;
- message strcharinfo(0), "World Shift : Shifted to Tulimshar (Area MMVI)";
- misceffect FX_PENTAGRAM_BUILDUP, strcharinfo(0);
- end;
-
-//////////////////////////////////////////////////////
-L_EmulateDeath:
- set @alonso, 1;
- callfunc "DoomsdayAct5";
- end;
-
-L_Close:
- close;
-
-L_FailCross:
- warp "045-1", 105, 125;
- close;
-
-//////////////////////////////////////////////////////
-OnInit:
- set .invocation$, chr(MAGIC_SYMBOL) + "alonsialonso"; // used in npcs that refer to this spell
- registercmd .invocation$, strnpcinfo(0);
- end;
-}
-