- Fixed a 'typo' which made my last commit actually not fix anything (Plagiarize can no longer copy skill levels beyond their max skill_db value)

- Corrected Diablo's Robe equip-level and weapon-level columns being exchanged.


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

2 files changed, 2 insertions, 2 deletions

diff --git a/db/item_db.txt b/db/item_db.txt
index e04ca2d95..20e556400 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1192,7 +1192,7 @@
 2371,G_Strings_,Pantie,5,1000,,100,,4,,1,0xFFFFFFFF,7,2,16,,0,1,0,{},{},{}
 2372,Mage_Coat_,Mage Coat,5,,10,600,,5,,1,0x00810204,7,2,16,,50,1,0,{ bonus bMdef,5; bonus bInt,1; },{},{}
 2373,Holy_Robe_,Holy Robe,5,,10,1700,,7,,1,0x00008110,7,2,16,,60,1,0,{ bonus bMdef,5; bonus2 bSubRace,RC_Demon,15; bonus2 bSubEle,Ele_Dark,10; },{},{}
-2374,Diablos_Robe,Diablos Robe,5,,,300,,6,,1,0x00098B1C,2,2,16,55,0,1,0,{ bonus bMaxSP,150; bonus bMdef,5; bonus2 bSkillheal,28,6; bonus bDelayRate,-10; if (isequipped(2729)) bonus bAtkRate,3; bonus bMatkRate,3; },{},{}
+2374,Diablos_Robe,Diablos Robe,5,,,300,,6,,1,0x00098B1C,2,2,16,,55,1,0,{ bonus bMaxSP,150; bonus bMdef,5; bonus2 bSkillheal,28,6; bonus bDelayRate,-10; if (isequipped(2729)) bonus bAtkRate,3; bonus bMatkRate,3; },{},{}
 2375,Diablos_Armor,Diablos Armor,5,,,600,,7,,1,0x000654E2,2,2,16,,0,1,0,{ bonus bStr,2; bonus bDex,1; bonus bMaxHP,150; bonus2 bResEff,Eff_Stun,500; bonus2 bResEff,Eff_Stone,500; if (isequipped(2729)) bonus bAtkRate,3; bonus bMatkRate,3; },{},{}
 2376,General's_Plate_Mail,General's Plate Mail,5,,,0,,7,,1,0x006444A2,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2538) && isequipped(2435)) { bonus2 bSubRace,RC_DemiHuman,3; bonus bVit,3; bonus bMaxHPRate,12; bonus2 bAddItemHealRate,IG_Recovery,10; bonusautoscript "{ heal 6000,0; }",10,BF_WEAPON; }; },{},{}
 2377,Elite_Engineer's_Armor,Elite Engineer's Armor,5,,,0,,7,,1,0x00040420,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2538) && isequipped(2435)) { bonus2 bSubRace,RC_DemiHuman,3; bonus bStr,3; bonus bMaxHPRate,12; bonus2 bSkillAtk,42,20; bonus2 bSkillHeal,231,10; bonus bUnbreakableArmor,0; }; },{},{}
diff --git a/src/map/skill.c b/src/map/skill.c
index 5bd4f3aed..4115d08d8 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1602,7 +1602,7 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
 			if ((type = pc_checkskill(tsd,RG_PLAGIARISM)) < lv)
 				lv = type;
 			//kRO Update makes it impossible to copy skills beyond the skill_db max.
-			if ((type = skill_get_max(RG_PLAGIARISM)) < lv)
+			if ((type = skill_get_max(skillid)) < lv)
 				lv = type;
 
 			tsd->cloneskill_id = skillid;