diff options
| m--------- | client-data | 0 | ||||
| -rw-r--r-- | world/map/npc/annuals/xmas/2020.txt | 16 |
2 files changed, 10 insertions, 6 deletions
diff --git a/client-data b/client-data -Subproject e34b688e296c76cbf0c1fb6d1e9942468b1f6c1 +Subproject 2a5e97c22db8b53666197608a9b5aa44c123a06 diff --git a/world/map/npc/annuals/xmas/2020.txt b/world/map/npc/annuals/xmas/2020.txt index 0ad40cdc..87b07a85 100644 --- a/world/map/npc/annuals/xmas/2020.txt +++ b/world/map/npc/annuals/xmas/2020.txt @@ -22,6 +22,16 @@ OnHit: if ((BaseLevel < 30) || (gettimetick(2) - TUT_var < 2*7*86400)) end; + // Not equipped to hunt Grinchboos + //if (getequipid(equip_arrow) != 5260) + // end; + if (getequipid(equip_hand1) != 5261) + end; + + // tell the spells they were discharged + // XXX: maybe we could make it do area damage when you discharge (release your energy all of a sudden) + addtimer 0, "::OnDischarge"; // seeks OnDischarge in ALL npcs + // Magic cheat if (@wandspell[4]) end; @@ -38,12 +48,6 @@ OnHit: if (@upmarmuspell[1]) end; - // Not equipped to hunt Grinchboos - //if (getequipid(equip_arrow) != 5260) - // end; - if (getequipid(equip_hand1) != 5261) - end; - // By last, check for Arrow Hail set @nearby, 0; foreach 1, getmap(), @away[0] - 14, @away[1] - 14, @away[0] + 14, @away[1] + 14, |