From 5a9b8370a70c2bb14814a0f880b572bb9bd29440 Mon Sep 17 00:00:00 2001 From: mekolat Date: Mon, 30 Nov 2015 08:57:08 -0500 Subject: Remove skeleton charm restrictions --- world/map/db/item_db_trinket.txt | 2 +- world/map/npc/annuals/halloween/munro.txt | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) (limited to 'world/map') diff --git a/world/map/db/item_db_trinket.txt b/world/map/db/item_db_trinket.txt index ae2a1a1f..0f5c589f 100644 --- a/world/map/db/item_db_trinket.txt +++ b/world/map/db/item_db_trinket.txt @@ -9,7 +9,7 @@ 832, GoldenFourLeafAmulet, 5, 40000, 4000, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, {bonus bLuk, 4;} 865, Grimoire, 5, 5000, 2500, 100, 0, 0, 0, 5, 0, 2, 8, 0, 0, 0, {}, {bonus bMaxSP, 30;} 879, HeartOfIsis, 5, 70000, 35000, 40, 0, 0, 0, 0, 0, 2, 8, 0, 85, 0, {}, {bonus bMaxHPrate, 15; bonus bHPrecovRate, 65;} -1197, SkeletonCharm, 5, 0, 0, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, { callfunc "CheckMunro"; } +1197, SkeletonCharm, 5, 0, 0, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, {} 1244, DarkTalisman, 5, 0, 0, 0, 0, 30, 0, 100, 0, 2, 8, 0, 0, 0, {}, {set @minLvl, 1;callfunc "RestrictedItem";} 4008, DiamondRing, 5, 5000, 2500, 1, 0, 0, 0, 0, 0, 2, 128, 0, 0, 0, {}, {bonus bVit, 1;} 4009, RubyRing, 5, 5000, 2500, 1, 0, 0, 0, 0, 0, 2, 128, 0, 0, 0, {}, {bonus bStr, 1;} diff --git a/world/map/npc/annuals/halloween/munro.txt b/world/map/npc/annuals/halloween/munro.txt index 45abfaa8..feb71aea 100644 --- a/world/map/npc/annuals/halloween/munro.txt +++ b/world/map/npc/annuals/halloween/munro.txt @@ -1,4 +1,4 @@ -// Part of Annual halloween +// Part of Annual halloween 026-1,24,37,0|script|Munro|183 { callfunc "HalloweenCheckOld"; @@ -47,14 +47,3 @@ L_DisableMunro: L_Return: return; } -function|script|CheckMunro -{ - if (($@halloween_time) || ($@xmas_time)) - goto L_Return; - - callfunc "UnequipLater"; - goto L_Return; - -L_Return: - return; -} -- cgit v1.2.3-60-g2f50