summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-14 06:12:36 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-14 06:12:36 +0000
commit244d203039c35309d957c2d7c1e61c54f78eb2c3 (patch)
treed4e950a8c324290c944505917fbe0972780256a4
parent364b6c4bb3463f7ffdf55b7f7adc3b515febb7c7 (diff)
downloadhercules-244d203039c35309d957c2d7c1e61c54f78eb2c3.tar.gz
hercules-244d203039c35309d957c2d7c1e61c54f78eb2c3.tar.bz2
hercules-244d203039c35309d957c2d7c1e61c54f78eb2c3.tar.xz
hercules-244d203039c35309d957c2d7c1e61c54f78eb2c3.zip
Don't typically update custom NPCs, but this was a special request and should fix an exploit in the card remover.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12587 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/custom/card_remover.txt12
2 files changed, 14 insertions, 0 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 0a1dbdcc9..48eabf883 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
======
+2008/04/14
+ * Rev. 12587 Fixed design flaw in card remover script. [L0ne_W0lf]
2008/04/10
* Rev. 12567 Fixed setcell range of first barricade in Juno Castle 2. [L0ne_W0lf]
2008/04/07
diff --git a/npc/custom/card_remover.txt b/npc/custom/card_remover.txt
index c3c6a35c2..27ecd3e6a 100644
--- a/npc/custom/card_remover.txt
+++ b/npc/custom/card_remover.txt
@@ -78,6 +78,18 @@ SLOT10:
CARDNUMCHECK:
if(getequipcardcnt(@part) == 0) goto DENYCARDCOUNT;
set @cardcount,getequipcardcnt(@part);
+
+ // Ensure there is room for the items.
+ if (!checkweight(1202,(@cardcount+1))) {
+ mes "^3355FFJust a minute!";
+ mes "I can't offer any of my";
+ mes "services to you because";
+ mes "you're carrying too much";
+ mes "stuff. Put your extra items in";
+ mes "Kafra Storage and come again~";
+ close;
+ }
+
if(@cardcount > 1) goto CARDNUMMULTIMSG;
mes "[Wise Old Woman]";
mes "This item has " + @cardcount + " card compounded on it. To perform my magic, I will need 225000 zeny, a ^0000FFStar Crumb^000000, and a ^0000FFYellow Gemstone^000000.";