Updated attribute table values and made it cleaner.

Fixed Battle Hook item (bugreport:3335).

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

2 files changed, 47 insertions, 50 deletions

diff --git a/db/attr_fix.txt b/db/attr_fix.txt
index 32ce86cb8..f9d6da1a8 100644
--- a/db/attr_fix.txt
+++ b/db/attr_fix.txt
@@ -1,53 +1,50 @@
-// Attribute correction
-// Side:Attribute of monster                         // Length:Attribute of attack
+//Neutral,Water,Earth,Fire,Wind,Poison,Holy,Shadow,Ghost,Undead
+// Row: Monster's Attribute		// Column: Attack's Attribute
+
 1,10	// lv1 Attribute table
-//Netr Watr Erth Fire Wind Pois Hly  Shdw Sens Imor
-  100, 100, 100, 100, 100, 100, 100, 100,  25, 100,  // Neutral
-  100,  25, 100, 150,  50, 100,  75, 100, 100, 100,  // Water
-  100, 100, 100,  50, 150, 100,  75, 100, 100, 100,  // Earth
-  100,  50, 150,  25, 100, 100,  75, 100, 100, 125,  // Fire
-  100, 175,  50, 100,  25, 100,  75, 100, 100, 100,  // Wind
-  100, 100, 125, 125, 125,   0,  75,  50, 100, -25,  // Poison
-  100, 100, 100, 100, 100, 100,   0, 125, 100, 150,  // Holy
-  100, 100, 100, 100, 100,  50, 125,   0, 100, -25,  // Shadow
-   25, 100, 100, 100, 100, 100,  75,  75, 125, 100,  // Sense
-  100, 100, 100, 100, 100,  50, 100,   0, 100,   0,  // Immortality
-// Side:Attribute of monster                         // Length:Attribute of attack
+100,100,100,100,100,100,100,100,25,100,	// Neutral
+100,25,100,150,50,100,75,100,100,100,	// Water
+100,100,100,50,150,100,75,100,100,100,	// Earth
+100,50,150,25,100,100,75,100,100,125,	// Fire
+100,175,50,100,25,100,75,100,100,100,	// Wind
+100,100,125,125,125,0,75,50,100,-25,	// Poison
+100,100,100,100,100,100,0,125,100,150,	// Holy
+100,100,100,100,100,50,125,0,100,-25,	// Shadow
+25,100,100,100,100,100,75,75,125,100,	// Ghost
+100,100,100,100,100,50,100,0,100,0,	// Undead
+
 2,10	// lv2 Attribute table
-//Netr Watr Erth Fire Wind Pois Hly  Shdw Sens Imor
-  100, 100, 100, 100, 100, 100, 100, 100,  25, 100,  // Neutral
-  100,   0, 100, 175,  25, 100,  50,  75, 100, 100,  // Water
-  100, 100,  50,  25, 175, 100,  50,  75, 100, 100,  // Earth
-  100,  25, 175,   0, 100, 100,  50,  75, 100, 150,  // Fire
-  100, 175,  25, 100,   0, 100,  50,  75, 100, 100,  // Wind
-  100,  75, 125, 125, 125,   0,  50,  25,  75, -50,  // Poison
-  100, 100, 100, 100, 100, 100, -25, 150, 100, 175,  // Holy
-  100, 100, 100, 100, 100,  25, 150, -25, 100, -50,  // Shadow
-    0,  75,  75,  75,  75,  75,  50,  50, 150, 125,  // Sense
-  100,  75,  75,  75,  75,  25, 125,   0, 100,   0,  // Immortality
-// Side:Attribute of monster                         // Length:Attribute of attack
+100,100,100,100,100,100,100,100,25,100,	// Neutral
+100,0,100,175,25,100,50,75,100,100,	// Water
+100,100,50,25,175,100,50,75,100,100,	// Earth
+100,25,175,0,100,100,50,75,100,150,	// Fire
+100,175,25,100,0,100,50,75,100,100,	// Wind
+100,75,125,125,125,0,50,25,75,-50,	// Poison
+100,100,100,100,100,100,-25,150,100,175,// Holy
+100,100,100,100,100,25,150,-25,100,-50,	// Shadow
+0,75,75,75,75,75,50,50,150,125,		// Ghost
+100,75,75,75,75,25,125,0,100,0,		// Undead
+
 3,10	// lv3 Attribute table
-//Netr Watr Erth Fire Wind Pois Hly  Shdw Sens Imor
-  100, 100, 100, 100, 100, 100, 100, 100,   0, 100,  // Neutral
-  100, -25, 100, 200,   0, 100,  25,  50, 100, 125,  // Water
-  100, 100,   0,   0, 200, 100,  25,  50, 100,  75,  // Earth
-  100,   0, 200, -25, 100, 100,  25,  50, 100, 175,  // Fire
-  100, 200,   0, 100, -25, 100,  25,  50, 100, 100,  // Wind
-  100,  50, 100, 100, 100,   0,  25,   0,  50, -75,  // Poison
-  100, 100, 100, 100, 100, 125, -50, 175, 100, 200,  // Holy
-  100, 100, 100, 100, 100,   0, 175, -50, 100, -75,  // Shadow
-    0,  50,  50,  50,  50,  50,  25,  25, 175, 150,  // Sense
-  100,  50,  50,  50,  50,   0, 150,   0, 100,   0,  // Immortality
-// Side:Attribute of monster                         // Length:Attribute of attack
+100,100,100,100,100,100,100,100,0,100,	// Neutral
+100,-25,100,200,0,100,25,50,100,125,	// Water
+100,100,0,0,200,100,25,50,100,75,	// Earth
+100,0,200,-25,100,100,25,50,100,175,	// Fire
+100,200,0,100,-25,100,25,50,100,100,	// Wind
+100,50,100,100,100,0,25,0,50,-75,	// Poison
+100,100,100,100,100,125,-50,175,100,200,// Holy
+100,100,100,100,100,0,175,-50,100,-75,	// Shadow
+0,50,50,50,50,50,25,25,175,150,		// Ghost
+100,50,50,50,50,0,150,0,100,0,		// Undead
+
 4,10	// lv4 Attribute table
-//Netr Watr Erth Fire Wind Pois Hly  Shdw Sens Imor
-  100, 100, 100, 100, 100, 100, 100, 100,   0, 100,  // Neutral
-  100, -50, 100, 200,   0,  75,   0,  25, 100, 150,  // Water
-  100, 100, -25,   0, 200,  75,   0,  25, 100,  50,  // Earth
-  100,   0, 200, -50, 100,  75,   0,  25, 100, 200,  // Fire
-  100, 200,   0, 100, -50,  75,   0,  25, 100, 100,  // Wind
-  100,  25,  75,  75,  75,   0,   0, -25,  25,-100,  // Poison
-  100,  75,  75,  75,  75, 125,-100, 200, 100, 200,  // Holy
-  100,  75,  75,  75,  75, -25, 200,-100, 100,-100,  // Shadow
-    0,  25,  25,  25,  25,  25,   0,   0, 200, 175,  // Sense
-  100,  25,  25,  25,  25, -25, 175,   0, 100,   0,  // Immortality
+100,100,100,100,100,100,100,100,0,100,	// Neutral
+100,-50,100,200,0,75,0,25,100,150,	// Water
+100,100,-25,0,200,75,0,25,100,50,	// Earth
+100,0,200,-50,100,75,0,25,100,200,	// Fire
+100,200,0,100,-50,75,0,25,100,100,	// Wind
+100,25,75,75,75,0,0,-25,25,-100,	// Poison
+100,75,75,75,75,125,-100,200,100,200,	// Holy
+100,75,75,75,75,-25,200,-100,100,-100,	// Shadow
+0,25,25,25,25,25,0,0,200,175,		// Ghost
+100,25,25,25,25,-25,175,0,100,0,	// Undead
\ No newline at end of file
diff --git a/db/item_db.txt b/db/item_db.txt
index b5dd7f8eb..2a6c3fd7d 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -696,7 +696,7 @@
 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; },{},{}
 1420,Long_Horn,Long Horn,4,20,,1000,150,,3,1,0x00004082,2,2,2,4,65,1,4,{ bonus bAtkEle,Ele_Holy; bonus2 bAddEff,Eff_Bleeding,500; skill "TF_DETOXIFY",1; bonus bUnbreakableWeapon,0; if(isequipped(2115)) bonus3 bAutoSpellWhenHit,"HP_ASSUMPTIO",2,5; },{},{}
-1421,Battle_Hook,Battle Hook,4,20,,900,140,,3,1,0x00004082,2,2,2,4,65,1,4,{ bonus2 bAddEff,Eff_Stun,500; bonus2 bAddRace,RC_DemiHuman,10; skill "KN_PIERCE",3; },{},{}
+1421,Battle_Hook,Battle Hook,4,20,,900,140,,3,1,0x00004082,2,2,2,4,65,1,4,{ bonus2 bAddEff,Eff_Stun,500; bonus2 bAddRace,RC_DemiHuman,20; skill "KN_PIERCE",3; },{},{}
 1422,Hunting_Spear,Hunting Spear,4,20,,4200,180,,3,1,0x00004082,2,2,2,4,60,1,4,{ bonus bIgnoreDefRace,RC_Brute; bonus3 bAddMonsterDropItem,517,RC_Brute,1000; bonus3 bAutoSpell,"LK_JOINTBEAT",3,100; },{},{}
 1423,Pole_XO,Pole XO,4,20,,0,120,,3,0,0x00004082,7,2,2,1,1,0,4,{ bonus2 bAddRace,RC_Boss,50; bonus2 bAddRace,RC_NonBoss,50; },{},{}
 1424,Skewer_C,Refined Brocca,4,1,,0,149,,3,0,0x00004082,7,2,2,4,1,0,4,{ bonus bIgnoreDefRace,RC_NonBoss; bonus2 bAddSize,1,20; },{},{}