- 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

6 files changed, 26 insertions, 18 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 3f3e7494d..a826693d3 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -40,8 +40,12 @@
 	2385 Recuvative_Armor		Should trigger HP/SP return with magical kills as well.
 
 =======================
+2008/11/18
+	* Rev. 13376 Some bug fixes here too! Holy crap! Bug fixes everywhere! [L0ne_W0lf]
+	- Corrected Wolfheiden and Mithril magic cape skill levels. (bugreport:2431)
+	- Corrected 12.1 monsters using penuma on target not self. (bugreport:2435)
 2008/11/07
-	* Rev. 13356 Corrected typo in Librarian Gloves bonuses. [L0ne_W0lf]
+	* Rev. 13357 Corrected typo in Librarian Gloves bonuses. [L0ne_W0lf]
 2008/11/05
 	* Fixed the maximum level of Create Elemental Converter. (bugreport:2423) [Sara]
 2008/10/27
diff --git a/db/item_db.txt b/db/item_db.txt
index a5399bc88..f082894e0 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1314,8 +1314,8 @@
 2528,Wool_Scarf,Wool Scarf,5,10000,,500,,3,,1,0xFFFFFFFE,2,2,4,,55,1,0,{ bonus bMdef,4;},{},{}
 2529,Rider_Insignia,Crest of the Rider,5,10000,,500,,4,,0,0xFFFFFFFE,2,2,4,,55,1,0,{ bonus bAgi,2; if (isequipped(2425) || isequipped(2434)) bonus bFlee,10; },{},{}
 2530,Rider_Insignia_,Crest of the Rider,5,10000,,500,,4,,1,0xFFFFFFFE,2,2,4,,55,1,0,{ bonus bAgi,2; if (isequipped(2425) || isequipped(2434)) bonus bFlee,10; },{},{}
-2531,Ulfhedinn,Wolfheiden,5,10000,,700,,3,,1,0x000654E2,2,2,4,,70,1,0,{ bonus5 bAutoSpellWhenHit,"NPC_STONESKIN",6,20,BF_WEAPON,0; },{},{}
-2532,Mithril_Magic_Cape,Mithril Magic Manteau,5,10000,,400,,3,,1,0x00098B1C,2,2,4,,70,1,0,{ bonus bMdef,3; bonus5 bAutoSpellWhenHit,"NPC_ANTIMAGIC",6,200,BF_MAGIC,0; },{},{}
+2531,Ulfhedinn,Wolfheiden,5,10000,,700,,3,,1,0x000654E2,2,2,4,,70,1,0,{ bonus5 bAutoSpellWhenHit,"NPC_STONESKIN",1,20,BF_WEAPON,0; },{},{}
+2532,Mithril_Magic_Cape,Mithril Magic Manteau,5,10000,,400,,3,,1,0x00098B1C,2,2,4,,70,1,0,{ bonus bMdef,3; bonus5 bAutoSpellWhenHit,"NPC_ANTIMAGIC",1,200,BF_MAGIC,0; },{},{}
 //2533,Freya_Cape,Freya's Manteau,5,0,,200,,10,,0,0xFFFFFFFE,7,2,4,,0,1,0,{ bonus2 bSubRace,RC_DemiHuman,15; },{},{}
 2534,Ruffler,Ruffler,5,20,,0,,10,,0,0x006654E2,7,2,4,1,1,0,0,{ bonus2 bSubEle,Ele_Neutral,17; bonus bFlee,17; },{},{}
 2535,Cloak_of_Survival_C,Refined Survivor's Manteau,5,1,,0,,5,,0,0x00810204,7,2,4,,1,0,0,{ bonus bVit,10; bonus bMdef,10; if (isequipped(1618) || isequipped(1620)) { bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; } },{},{}
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index bf1a8c392..f851eac93 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -4713,7 +4713,7 @@
 1904,Bomb Poring@NPC_SELFDESTRUCTION,chase,173,2,10000,3000,0,no,self,always,0,,,,,,
 
 // Satan Morroc (Based on information from Future Wiki)
-1916,Satan Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1916,Satan Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1916,Satan Morroc@AL_HEAL,idle,28,9,10000,0,2000,yes,self,myhpltmaxrate,99,,,,,,
 1916,Satan Morroc@NPC_SUMMONSLAVE,attack,196,4,10000,700,10000,no,self,slavele,1,1918,1919,1920,1921,,
 1916,Satan Morroc@NPC_SUMMONSLAVE,idle,196,4,10000,700,10000,no,self,slavele,1,1918,1919,1920,1921,,
@@ -4744,7 +4744,7 @@
 1916,Satan Morroc@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,
 1916,Satan Morroc@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,
 // MVP
-1917,Wounded Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1917,Wounded Morroc@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1917,Wounded Morroc@AL_HEAL,idle,28,9,10000,0,2000,yes,self,myhpltmaxrate,99,,,,,,
 1917,Wounded Morroc@NPC_SUMMONSLAVE,attack,196,4,10000,700,10000,no,self,slavele,1,1918,1919,1920,1921,,
 1917,Wounded Morroc@NPC_SUMMONSLAVE,idle,196,4,10000,700,10000,no,self,slavele,1,1918,1919,1920,1921,,
@@ -4776,7 +4776,7 @@
 1917,Wounded Morroc@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,
 
 //Standard Mobs
-1918,Morroc Shadow (Angel)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1918,Morroc Shadow (Angel)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1918,Morroc Shadow (Angel)@AL_HEAL,any,28,11,10000,0,600,yes,self,myhpltmaxrate,99,,,,,,
 1918,Morroc Shadow (Angel)@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,
 1918,Morroc Shadow (Angel)@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,
@@ -4788,26 +4788,26 @@
 1918,Morroc Shadow (Angel)@NPC_GRANDDARKNESS,attack,339,10,1000,700,5000,no,self,always,,,,,,,
 1918,Morroc Shadow (Angel)@SA_DISPELL,chase,289,5,10000,0,30000,yes,target,always,0,,,,,,
 
-1919,Morroc Shadow (Golem)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1919,Morroc Shadow (Golem)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1919,Morroc Shadow (Golem)@NPC_BLOODDRAIN,chase,199,1,1000,0,5000,yes,target,always,0,,,,,,
 1919,Morroc Shadow (Golem)@NPC_WIDEBLEEDING,chase,665,4,5000,300,15000,yes,self,always,,,,,,,
 1919,Morroc Shadow (Golem)@NPC_EARTHQUAKE,chase,653,5,10000,500,50000,no,self,myhpltmaxrate,20,,,,,,6
 1919,Morroc Shadow (Golem)@SM_MAGNUM,attack,7,10,2000,0,5000,no,self,always,0,,,,,,
 
-1920,Morroc Shadow (Human)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1920,Morroc Shadow (Human)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1920,Morroc Shadow (Human)@NPC_CRITICALWOUND,attack,673,3,1000,0,10000,no,target,always,0,,,,,,
 1920,Morroc Shadow (Human)@AL_HEAL,any,28,5,5000,0,600,yes,self,myhpltmaxrate,60,,,,,,
 1920,Morroc Shadow (Human)@NPC_ENERGYDRAIN,attack,200,1,1000,0,5000,yes,target,always,0,,,,,,
 1920,Morroc Shadow (Human)@NPC_WIDESILENCE,attack,663,5,1000,0,20000,no,self,myhpltmaxrate,50,,,,,,
 
-1921,Morroc Shadow (Spirit)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1921,Morroc Shadow (Spirit)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1921,Morroc Shadow (Spirit)@AL_HEAL,any,28,11,10000,0,600,yes,friend,friendhpltmaxrate,99,,,,,,
 1921,Morroc Shadow (Spirit)@AL_HEAL,any,28,11,10000,0,600,yes,self,myhpltmaxrate,99,,,,,,
 1921,Morroc Shadow (Spirit)@HP_ASSUMPTIO,idle,361,5,5000,1000,10000,no,self,always,,,,,,,
 1921,Morroc Shadow (Spirit)@HP_ASSUMPTIO,idle,361,5,5000,1000,10000,no,friend,always,,,,,,,
 
 // No EXP/Drops
-1922,Morroc Shadow (Angel)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1922,Morroc Shadow (Angel)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1922,Morroc Shadow (Angel)@AL_HEAL,any,28,11,10000,0,600,yes,self,myhpltmaxrate,99,,,,,,
 1922,Morroc Shadow (Angel)@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,
 1922,Morroc Shadow (Angel)@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,
@@ -4822,20 +4822,20 @@
 1922,Morroc Shadow (Angel)@WZ_VERMILION,idle,85,20,10000,1000,10000,no,randomtarget,always,0,,,,,,
 1922,Morroc Shadow (Angel)@WZ_JUPITEL,attack,84,28,3000,1000,10000,no,target,always,0,,,,,,
 
-1923,MORROC_SHADOW_GOLE@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1923,MORROC_SHADOW_GOLE@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1923,Morroc Shadow (Golem)@NPC_SUMMONSLAVE,attack,196,6,10000,700,10000,no,self,always,0,1937,,,,,
 1923,Morroc Shadow (Golem)@NPC_BLOODDRAIN,chase,199,1,1000,0,5000,yes,target,always,0,,,,,,
 1923,Morroc Shadow (Golem)@NPC_WIDEBLEEDING,chase,665,4,5000,300,15000,yes,self,always,,,,,,,
 1923,Morroc Shadow (Golem)@NPC_EARTHQUAKE,chase,653,5,10000,200,10000,no,self,myhpltmaxrate,80,,,,,,6
 1923,Morroc Shadow (Golem)@SM_MAGNUM,attack,7,10,2000,0,5000,no,self,always,0,,,,,,
 
-1924,Morroc Shadow (Human)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1924,Morroc Shadow (Human)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1924,Morroc Shadow (Human)@NPC_CRITICALWOUND,attack,673,4,1000,0,10000,no,target,always,0,,,,,,
 1924,Morroc Shadow (Human)@AL_HEAL,any,28,5,5000,0,600,yes,self,myhpltmaxrate,60,,,,,,
 1924,Morroc Shadow (Human)@NPC_ENERGYDRAIN,attack,200,1,1000,0,5000,yes,target,always,0,,,,,,
 1924,Morroc Shadow (Human)@NPC_WIDESILENCE,attack,663,5,1000,0,20000,no,self,always,,,,,,,
 
-1925,Morroc Shadow (Spirit)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,target,longrangeattacked,0,,,,,,
+1925,Morroc Shadow (Spirit)@AL_PNEUMA,idle,25,1,10000,0,1000,yes,self,longrangeattacked,0,,,,,,
 1925,Morroc Shadow (Spirit)@HP_ASSUMPTIO,idle,361,5,10000,1000,10000,no,friend,always,,,,,,,
 1925,Morroc Shadow (Spirit)@HP_ASSUMPTIO,idle,361,5,10000,1000,10000,no,self,always,,,,,,,
 1925,Morroc Shadow (Spirit)@AL_HEAL,any,28,11,10000,0,600,yes,friend,friendhpltmaxrate,99,,,,,,
@@ -4884,7 +4884,6 @@
 1957,Entweihen@NPC_POWERUP,attack,349,5,10000,0,30000,yes,self,myhpltmaxrate,50,,,,,,
 1957,Entweihen@NPC_MAGICALATTACK,attack,192,1,2000,0,5000,yes,randomtarget,myhpltmaxrate,70,,,,,,
 1957,Entweihen@NPC_DARKBREATH,attack,202,10,2000,0,10000,no,randomtarget,myhpltmaxrate,50,,,,,,9
-1957,Entweihen@NPC_SUMMONSLAVE,idle,196,2,10000,0,0,no,self,onspawn,0,1008,,,,,
 1957,Entweihen@NPC_EXPULSION,attack,674,1,1000,1000,10000,no,self,myhpltmaxrate,60,,,,,,
 1957,Entweihen@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,randomtarget,always,0,,,,,,6
 1957,Entweihen@NPC_DEFENDER,attack,205,1,500,0,30000,yes,self,longrangeattacked,,,,,,,29
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;