diff options
| -rw-r--r-- | npc/annuals/xmas/2021.txt | 9 | ||||
| -rw-r--r-- | npc/functions/mob_points.txt | 11 |
2 files changed, 12 insertions, 8 deletions
diff --git a/npc/annuals/xmas/2021.txt b/npc/annuals/xmas/2021.txt index cba5dfe9..8158728e 100644 --- a/npc/annuals/xmas/2021.txt +++ b/npc/annuals/xmas/2021.txt @@ -217,14 +217,7 @@ public function spawn { /* Aqua Ticket Drops */ if (playerattached()) { if (instance_id() < 0) return; // No drops outside instanced maps - if (getmonsterinfo(getarg(0), MOB_LV) >= 150) - getitem AquaTicket, 2; - else if (getmonsterinfo(getarg(0), MOB_LV) >= 100 && any(true, false)) - getitem AquaTicket, 2; - else if (getmonsterinfo(getarg(0), MOB_LV) >= 40 && any(true, false, false)) - getitem AquaTicket, 1; - else if (rand2(5) == 3) - getitem AquaTicket, 1; + fix_mobkill(getarg(0)); } return; } diff --git a/npc/functions/mob_points.txt b/npc/functions/mob_points.txt index b4361f0a..fb13def9 100644 --- a/npc/functions/mob_points.txt +++ b/npc/functions/mob_points.txt @@ -15,6 +15,17 @@ function script MobPoints { MONSTERS_KILLED+=1; @mobId=killedrid; + if (isChristmas21() && compare(getmap(), "@"+callfunc("X21ID2"))) { + if (getmonsterinfo(getarg(0), MOB_LV) >= 150) + getitem AquaTicket, 2; + else if (getmonsterinfo(getarg(0), MOB_LV) >= 100 && any(true, false)) + getitem AquaTicket, 2; + else if (getmonsterinfo(getarg(0), MOB_LV) >= 40 && any(true, false, false)) + getitem AquaTicket, 1; + else if (rand2(5) == 3) + getitem AquaTicket, 1; + } + if (MPQUEST) { .@moblv=strmobinfo(3,killedrid); |