* Fixed items that use the "AddSPAmount_Action" bonus on aegis

- Guillotine gives you 2 SP each time you attack something with a normal attack (only worked with DemiHuman)
- Tjungkuletti gives you 1 SP each time you attack something with a normal attack (before it drained 1 SP from the target instead)
- Dark Priest Card gives Sages 1 SP each time you attack something with a normal attack (before it was per kill)
- also added the bSPDrainValue bonus to the documentation again

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

3 files changed, 21 insertions, 5 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 7c55116e4..451a93452 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -37,6 +37,15 @@
 	2385 Recuvative_Armor		Should trigger HP/SP return with magical kills as well.
 
 =======================
+2009/04/21
+	* Fixed items that use the "AddSPAmount_Action" bonus on aegis [Playtester]
+	- Guillotine gives you 2 SP each time you attack something with a normal attack
+	  (only worked with DemiHuman)
+	- Tjungkuletti gives you 1 SP each time you attack something with a normal attack
+	  (before it drained 1 SP from the target instead)
+	- Dark Priest Card gives Sages 1 SP each time you attack something with a normal attack
+	  (before it was per kill)
+	- also added the bSPDrainValue bonus to the documentation again
 2009/04/20
 	* Fixed slotted Memory Book not giving the combo bonus (bugreport:2997) [Playtester]
 2009/04/17
diff --git a/db/item_db.txt b/db/item_db.txt
index 942e37bb8..0159ee3b9 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -661,7 +661,7 @@
 1366,Right_Epsilon,Light Epsilon,4,20,,2300,180,,1,0,0x000444A2,7,2,34,4,44,1,7,{ bonus bAtkEle,Ele_Holy; skill "AL_HEAL",3; bonus2 bAddRace,RC_Demon,3; },{},{}
 1367,Slaughter,Slaughter,4,20,,2500,120,,1,0,0x000444A2,7,2,34,4,44,1,7,{ bonus bAtkEle,Ele_Earth; bonus bIgnoreDefRace,RC_Brute; bonus2 bWeaponComaRace,RC_Brute,400; },{},{}
 1368,Tomahawk,Tomahawk,4,20,,2500,165,,1,0,0x000444A2,7,2,34,4,44,1,7,{ bonus bAtkEle,Ele_Wind; skill "ITM_TOMAHAWK",1; },{},{}
-1369,Guillotine,Guillotine,4,20,,3000,215,,1,0,0x000444A2,7,2,34,4,44,1,7,{ bonus2 bWeaponComaRace,RC_DemiHuman,300; bonus2 bSPDrainValueRace,RC_DemiHuman,2; bonus2 bSPGainRace,RC_DemiHuman,20; },{},{}
+1369,Guillotine,Guillotine,4,20,,3000,215,,1,0,0x000444A2,7,2,34,4,44,1,7,{ bonus2 bWeaponComaRace,RC_DemiHuman,300; bonus bSPDrainValue,2; bonus bSPGainValue,20; },{},{}
 1370,Doom_Slayer,Doom Slayer,4,20,,6000,10,,1,0,0x000444A2,7,2,34,4,80,1,7,{ bonus bAspdRate,-40; bonus bUseSPrate,100; if(readparam(bStr)>=95){ bonus bBaseAtk,340; bonus2 bAddEff,Eff_Stun,3000; bonus bBreakArmorRate,500; } },{},{}
 1371,Doom_Slayer_,Doom Slayer,4,20,,6000,10,,1,1,0x000444A2,7,2,34,4,80,1,7,{ bonus bAspdRate,-40; bonus bUseSPrate,100; if(readparam(bStr)>=95){ bonus bBaseAtk,340; bonus2 bAddEff,Eff_Stun,3000; bonus bBreakArmorRate,500; } },{},{}
 1372,Right_Epsilon_C,Refined Light Epsilon,4,1,,0,229,,1,0,0x000444A2,7,2,34,4,1,0,7,{ bonus bAtkEle,Ele_Holy; skill "AL_HEAL",3; bonus2 bAddRace,RC_Demon,3; bonus bStr,10; bonus bSpeedRate,25; },{},{}
@@ -691,7 +691,7 @@
 1413,Gungnir,Gungnir,4,20,,500,120,,3,0,0x00004082,7,2,2,4,4,1,4,{ bonus bAtkEle,Ele_Wind; bonus bPerfectHitRate,25; bonus bHit,30; },{},{}
 1414,Gelerdria,Gelerdria,4,20,,700,145,,3,0,0x00004082,7,2,2,4,48,1,4,{ bonus bAtkEle,Ele_Earth; bonus bMaxHP,800; bonus bMaxSP,-50; },{},{}
 1415,Skewer,Brocca,4,20,,850,100,,3,0,0x00004082,7,2,2,4,48,1,4,{ bonus bIgnoreDefRace,RC_NonBoss; bonus2 bAddEle,Ele_Neutral,25; },{},{}
-1416,Tjungkuletti,Tjungkuletti,4,20,,1000,95,,3,0,0x00004082,7,2,2,4,48,1,4,{ bonus2 bSPDrainValue,1,1; bonus bSPGainValue,5; },{},{}
+1416,Tjungkuletti,Tjungkuletti,4,20,,1000,95,,3,0,0x00004082,7,2,2,4,48,1,4,{ bonus bSPDrainValue,1; bonus bSPGainValue,5; },{},{}
 1417,Pole_Axe,Pole Axe,4,20,,3800,160,,3,1,0x00004082,7,2,2,3,71,1,4,{ bonus bStr,1; bonus bInt,2; bonus bDex,1; },{},{}
 1418,Gungnir_,Gungnir,4,20,,500,120,,3,2,0x00004082,7,2,2,4,4,1,4,{ bonus bAtkEle,Ele_Wind; bonus bPerfectHitRate,25; bonus bHit,30; },{},{}
 1419,Pole_Axe_C,Refined Pole Axe,4,1,,4800,159,,3,0,0x00004082,7,2,2,3,1,0,4,{ bonus bStr,1; bonus bInt,2; bonus bDex,1; },{},{}
@@ -1701,7 +1701,7 @@
 4168,Dark_Lord_Card,Dark Lord Card,6,20,,10,,,,,,,,64,,,,,{ bonus5 bAutoSpellWhenHit,"WZ_METEOR",5,100,BF_SHORT,1; if(isequipped(4169)) { bonus bMaxHPrate,20; bonus bMaxSPrate,20; } },{},{}
 4169,Dark_Illusion_Card,Dark Illusion Card,6,20,,10,,,,,,,,769,,,,,{ bonus bMaxHPrate,-10; bonus bMaxSPrate,-10; bonus bCastrate,-10-10*isequipped(4168); },{},{}
 4170,Dark_Frame_Card,Dark Frame Card,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Stone,600; },{},{}
-4171,Dark_Priest_Card,Dark Priest Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bSPVanishRate,50,10; if(BaseJob==Job_Sage) bonus bSPGainValue,1; },{},{}
+4171,Dark_Priest_Card,Dark Priest Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bSPVanishRate,50,10; if(BaseJob==Job_Sage) bonus bSPDrainValue,1; },{},{}
 4172,The_Paper_Card,The Paper Card,6,20,,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,20; bonus2 bSPDrainValue,-1,0; },{},{}
 4173,Demon_Pungus_Card,Demon Pungus Card,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Sleep,600; },{},{}
 4174,Deviling_Card,Deviling Card,6,20,,10,,,,,,,,4,,,,,{ bonus2 bSubEle,Ele_Neutral,50; bonus2 bSubEle,Ele_Water,-50; bonus2 bSubEle,Ele_Earth,-50; bonus2 bSubEle,Ele_Fire,-50; bonus2 bSubEle,Ele_Wind,-50; bonus2 bSubEle,Ele_Poison,-50; bonus2 bSubEle,Ele_Holy,-50; bonus2 bSubEle,Ele_Dark,-50; bonus2 bSubEle,Ele_Ghost,-50; bonus2 bSubEle,Ele_Undead,-50; },{},{}
diff --git a/doc/item_bonus.txt b/doc/item_bonus.txt
index 22c7581fd..e8a41505c 100644
--- a/doc/item_bonus.txt
+++ b/doc/item_bonus.txt
@@ -3,14 +3,14 @@
 //===== By ================================================
 //= Developers
 //===== Version ===========================================
-//= 1.1.20090122
+//= 1.1.20090421
 //=========================================================
 //= 1.0 - Standardized doc file
 //= 1.1.20080612 - skill command and bonuses (bAutoSpell, bSkillAtk, 
 //=   bSkillHeal, bAutoSpellWhenHit, bAddSkillBlow, bCastrate) accept 
 //=   skill names [FlavioJS]
 //= 1.1.20090122 - removed outdated bSPDrainValue command [ultramage]
-//= 
+//= 1.1.20090421 - added the correct bonus documentation for bSPDrainValue [Playtester]
 //===== Description =======================================
 //= List of script instructions used in item bonuses,
 //= mainly bonus/bonus2/bonus3/bonus4/bonus5 arguments
@@ -322,3 +322,10 @@ bonus2 bWeaponComaRace,x,y;		y/100% chance to cause Coma when attacking a monste
 bAddStealRate,n;			n/100% increase to Steal skill success chance
 
 bonus2 bAddSkillBlow,x,y;	Pushback the target by y cells when using skill x (supports skill names)
+
+bonus bSPDrainValue,n;			When hitting a monster by physical attack, you gain n SP
+					(use negative numbers so the user loses SP)
+bonus2 bSPDrainValue,n,x;		When hitting a monster by physical attack, ...
+					x:					
+					0=you gain n SP
+					1=you drain n SP from target