From 244d203039c35309d957c2d7c1e61c54f78eb2c3 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Mon, 14 Apr 2008 06:12:36 +0000 Subject: 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 --- npc/Changelog.txt | 2 ++ npc/custom/card_remover.txt | 12 ++++++++++++ 2 files changed, 14 insertions(+) (limited to 'npc') 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."; -- cgit v1.2.3-70-g09d2