From b3c25ec3d41cf95c04270adbc08c0c30b1848d48 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 17 Aug 2020 18:28:47 -0300 Subject: Doomsday Act 5 - Keshlam's Adventurer Guild (#560) Contains utils, gameplay and epilogue functions for Doomsday Act 5 THE FINAL BATTLE Note: Balancing patches may follow and are expected. The debug commands (`@js33`, `@js67` and `@js99`) were not removed. There might be overlap in voicing, in case specialeffect2() fails to work as intended. Bonus Content: * MONOCLE QUEST * Golden Apple healing is now instantaneous. * PVP Coin (Unrelated but anyway) * Golden PVP Cap. * Fix PVP Cap weight. --- world/map/npc/items/pickled_beets.txt | 3 +++ world/map/npc/items/rubber_bat.txt | 3 +++ world/map/npc/items/shock_sweet.txt | 2 ++ 3 files changed, 8 insertions(+) (limited to 'world/map/npc/items') diff --git a/world/map/npc/items/pickled_beets.txt b/world/map/npc/items/pickled_beets.txt index 4aaa1f1c..f05b73ca 100644 --- a/world/map/npc/items/pickled_beets.txt +++ b/world/map/npc/items/pickled_beets.txt @@ -6,5 +6,8 @@ function|script|usePickledBeets elif (Class == 2) setlook LOOK_HAIR_COLOR, 18; // add more here for races that have purple + + if ($DOOMSDAY == 3) + addtimer 10, "#TMWFinalExam::OnPickledBeets"; return; } diff --git a/world/map/npc/items/rubber_bat.txt b/world/map/npc/items/rubber_bat.txt index edf12416..9eb3725d 100644 --- a/world/map/npc/items/rubber_bat.txt +++ b/world/map/npc/items/rubber_bat.txt @@ -7,5 +7,8 @@ function|script|rubberBat L_Return: getitem "RubberBat", 1; + debugmes "Check"; + if ($DOOMSDAY == 3) + addtimer 10, "#TMWFinalExam::OnRubberBat"; return; } diff --git a/world/map/npc/items/shock_sweet.txt b/world/map/npc/items/shock_sweet.txt index ea5992c3..dc61790d 100644 --- a/world/map/npc/items/shock_sweet.txt +++ b/world/map/npc/items/shock_sweet.txt @@ -1,5 +1,7 @@ function|script|useShockSweet { + if (getmap() == "099-5") + addtimer 0, "Xakelbael the Dark#0::OnAdjustSweet"; if (rand(5)) goto L_Change; message strcharinfo(0), "Yuck, this tastes like earwax!"; -- cgit v1.2.3-60-g2f50