- Removed redundent input from mercenary vendor. (bugreport:2427)

- Corrected Wolfheiden and Mithril magic cape skill levels. (bugreport:2431)
- Corrected 12.1 monsters using penuma on target not self. (bugreport:2435)
- Fixed delitem causing the sign quest to fault. (bugreport:2444)


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13376 54d463be-8e91-2dee-dedb-b68131a5f0ec

3 files changed, 9 insertions, 4 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index f9fca1f37..775d2bdfc 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,9 @@
 Date		Added
 ======
+2008/11/18
+	* Rev. 13376 Bug fixes up the wazoo! Hoorah! L0ne's doing something! [L0ne_W0lf]
+	- Removed redundent input from mercenary vendor. (bugreport:2427)
+	- Fixed delitem causing the sign quest to fault. (bugreport:2444)
 2008/11/04
 	* Small update to fix merchant Paul Spanner from giving item 612 instead of .@item. (bugreport:2418) [Paradox924X]
 	* Fixed a few donpcevent's that didn't include the NPC's hidden display name. (bugreport:2407) [Paradox924X]
diff --git a/npc/other/mercenary_rent.txt b/npc/other/mercenary_rent.txt
index eec04287d..645f7dfd6 100644
--- a/npc/other/mercenary_rent.txt
+++ b/npc/other/mercenary_rent.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [L0ne_W0lf]
 //= 1.1 Optimization. [Zephyrus]
+//= 1.2 Removed redundent input. [L0ne_W0lf]
 //============================================================ 
 
 prontera,41,337,5	script	Mercenary Manager#Spear	105,{
@@ -681,7 +682,6 @@ prontera,30,337,4	script	Mercenary Merchant#Spear::MercMerchant	700,{
 		mes "Potions each cost 560 zeny.";
 		mes "How many would you like?";
 		next;
-		input .@input; //,0,10000;
 		callfunc "F_PurchaseMercItem",12241,560;
 	case 4:
 		mes "[Mercenary Goods Merchant]";
diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt
index ce6cae38f..ad9822bf0 100644
--- a/npc/quests/The_Sign_Quest.txt
+++ b/npc/quests/The_Sign_Quest.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= SinSloth(Most of the NPCs), MasterOfMuppets(Some of the NPCs + bug fixes) & Kargha(The quiz NPCs)
 //===== Current Version: ===================================== 
-//= 2.8
+//= 2.9
 //===== Compatible With: ===================================== 
 //= eAthena SVN 3422+(Requires jA Script System)
 //===== Description: ========================================= 
@@ -42,6 +42,7 @@
 //= 2.6 Fixed Engel giving back 7 Sobbing Starlight on failing to refine it, bugreport:1473 [Brainstorm]
 //= 2.7 Replaced effect numerics with constants. [Samuray22]
 //= 2.8 Fixed some bugs with itemids and leftover questitems [Fish0r]
+//= 2.9 Made a delitem causing script to fault use countitem when deleting. [L0ne_W0lf]
 //============================================================ 
 //===== Configuration : ======================================
 prontera,1,1,1	script	TheSignConfig	-1,{
@@ -8532,7 +8533,7 @@ L_Soul:
 	mes "I'm leaving my soul";
 	mes "with you. Please guide";
 	mes "me to the queen of the dead...";
-	delitem 7306,4;
+	delitem 7306,countitem(7306);
 	getitem 7307,1;
 	set signquest,54;
 	close;