diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2016-01-16 00:01:18 -0500 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-01-16 00:01:18 -0500 |
| commit | 4cc5d3ebbcf09433bc7b06115a24870759ed80ca (patch) | |
| tree | 06201b33b184fcb29d296bd684545429b7bc8d14 /world | |
| parent | d8963f20f870102068b39c7fd31cabc410208dc3 (diff) | |
| parent | 5a9b8370a70c2bb14814a0f880b572bb9bd29440 (diff) | |
| download | serverdata-4cc5d3ebbcf09433bc7b06115a24870759ed80ca.tar.gz serverdata-4cc5d3ebbcf09433bc7b06115a24870759ed80ca.tar.bz2 serverdata-4cc5d3ebbcf09433bc7b06115a24870759ed80ca.tar.xz serverdata-4cc5d3ebbcf09433bc7b06115a24870759ed80ca.zip | |
Merge pull request #442 from mekolat/skeleton-charm
Remove skeleton charm restrictions
Diffstat (limited to 'world')
| -rw-r--r-- | world/map/db/item_db_trinket.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/annuals/halloween/munro.txt | 13 |
2 files changed, 2 insertions, 13 deletions
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; -} |