- Modified the item_db and added view_types to ammo: 1 arrows, 2 dagger (venom knife), 3 bullets, 4 shells, 5 grenades, 6 shurikens, 7 kunais.

- Fixed parsing of job_db1.txt due to the MAX_WEAPON_TYPE change.
- Updated skill_require_db to specify the ammo types required for GS/NJ skills (as best as I could understand them)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5916 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/04/05
+	* Fixed parsing of job_db1.txt due to the MAX_WEAPON_TYPE change. [Skotlex]
 	* TK ranking kicks can't be used on sucession now (can't use any of the
 	  kick skills twice in a row without using a different one first). [Skotlex]
 	* Modified the ammo checks so that ammo is consumed at the end of

db/Changelog.txt

@@ -28,8 +28,13 @@
 =========================
 
 04/05
-	Updated item givers with ACTUAL items. ~10 Ep [Lupus]
-		item_cookie_bag.txt,item_cardalbum.txt,item_violetbox.txt,item_giftbox.txt,item_bluebox.txt
+	* Modified the item_db and added view_types to ammo: 1 arrows, 2 dagger
+	  (venom knife), 3 bullets, 4 shells, 5 grenades, 6 shurikens, 7 kunais.
+	  [Skotlex]
+	* Updated skill_require_db to specify the ammo types required for GS/NJ
+	  skills (as best as I could understand them) [Skotlex]
+	* Updated item givers with ACTUAL items. ~10 Ep [Lupus]
+	  item_cookie_bag.txt,item_cardalbum.txt,item_violetbox.txt,item_giftbox.txt,item_bluebox.txt
 03/31
 	* Changed the look field of all arrows to 1. [Skotlex]
 	* Added column "RequiredArrowType" to skill_require_db, set to 1 all

db/item_db.txt

@@ -756,28 +756,28 @@
 1724,Dragon_Wing,Dragon Wing,4,,10,1200,100,,5,0,1706056,7,2,34,4,60,1,11,{ bonus3 bAddMonsterDropItem,1765,9,300; bonus bIgnoreDefRace,RC_Dragon; }
 1725,Wandering_Bard's_Bow,Wandering Bard's Bow,4,,10,1700,120,,5,1,1574912,7,2,34,4,70,1,11,{ bonus bInt,2; bonus bSPrecovRate,10; }
 // Arrows
-1750,Arrow,Arrow,10,1,,1,25,,,,1706056,7,2,32768,,1,,22,{}
-1751,Silver_Arrow,Silver Arrow,10,3,,2,30,,,,1706056,7,2,32768,,1,,22,{ bonus bAtkEle,Ele_Holy; }
-1752,Fire_Arrow,Fire Arrow,10,3,,2,30,,,,1706056,7,2,32768,,1,,22,{ bonus bAtkEle,Ele_Fire; }
-1753,Steel_Arrow,Steel Arrow,10,2,,2,40,,,,1706056,7,2,32768,,1,,22,{}
-1754,Crystal_Arrow,Crystal Arrow,10,3,,2,30,,,,1706056,7,2,32768,,1,,22,{ bonus bAtkEle,Ele_Water; }
-1755,Arrow_of_Wind,Arrow of Wind,10,3,,2,30,,,,1706056,7,2,32768,,1,,22,{ bonus bAtkEle,Ele_Wind; }
-1756,Stone_Arrow,Stone Arrow,10,3,,2,30,,,,1706056,7,2,32768,,1,,22,{ bonus bAtkEle,Ele_Earth; }
-1757,Immaterial_Arrow,Immaterial Arrow,10,3,,1,30,,,,1706056,7,2,32768,,1,,22,{ bonus bAtkEle,Ele_Ghost; }
-1758,Stun_Arrow,Stun Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,22,{ bonus2 bAddEff,Eff_Stan,1000; }
-1759,Frozen_Arrow,Frozen Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,22,{ bonus bAtkEle,Ele_Water; bonus2 bAddEff,Eff_Freeze,1000; }
-1760,Flash_Arrow,Flash Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,22,{ bonus2 bAddEff,Eff_Blind,1000; }
-1761,Cursed_Arrow,Cursed Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,22,{ bonus2 bAddEff,Eff_Curse,1000; }
-1762,Rusty_Arrow,Rusty Arrow,10,3,,2,30,,,,1706056,7,2,32768,,1,,22,{ bonus bAtkEle,Ele_Poison; }
-1763,Poison_Arrow,Poison Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,22,{ bonus bAtkEle,Ele_Poison; bonus2 bAddEff,Eff_Poison,2000; }
-1764,Sharp_Arrow,Sharp Arrow,10,3,,3,10,,,,1706056,7,2,32768,,1,,22,{ bonus bCritical,10; }
-1765,Oridecon_Arrow,Oridecon Arrow,10,3,,3,50,,,,1706056,7,2,32768,,1,,22,{}
-1766,Arrow_of_Counter_Evil,Arrow of Counter Evil,10,40,,3,50,,,,1706056,7,2,32768,,1,,22,{ bonus bAtkEle,Ele_Holy; }
-1767,Arrow_of_Shadow,Shadow Arrow,10,3,,2,30,,,,1706056,7,2,32768,,1,,22,{ bonus bAtkEle,Ele_Dark; }
-1768,Sleep_Arrow,Sleep Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,22,{ bonus2 bAddEff,Eff_Sleep,2000; }
-1769,Mute_Arrow,Mute Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,22,{ bonus2 bAddEff,Eff_Silence,1000; }
-1770,Iron_Arrow,Iron Arrow,10,2,,1,30,,,,1706056,7,2,32768,,1,,22,{}
-1771,Venom_Knife,Venom Knife,10,50,,5,30,,,,4096,7,2,32768,,1,,22,{}
+1750,Arrow,Arrow,10,1,,1,25,,,,1706056,7,2,32768,,1,,1,{}
+1751,Silver_Arrow,Silver Arrow,10,3,,2,30,,,,1706056,7,2,32768,,1,,1,{ bonus bAtkEle,Ele_Holy; }
+1752,Fire_Arrow,Fire Arrow,10,3,,2,30,,,,1706056,7,2,32768,,1,,1,{ bonus bAtkEle,Ele_Fire; }
+1753,Steel_Arrow,Steel Arrow,10,2,,2,40,,,,1706056,7,2,32768,,1,,1,{}
+1754,Crystal_Arrow,Crystal Arrow,10,3,,2,30,,,,1706056,7,2,32768,,1,,1,{ bonus bAtkEle,Ele_Water; }
+1755,Arrow_of_Wind,Arrow of Wind,10,3,,2,30,,,,1706056,7,2,32768,,1,,1,{ bonus bAtkEle,Ele_Wind; }
+1756,Stone_Arrow,Stone Arrow,10,3,,2,30,,,,1706056,7,2,32768,,1,,1,{ bonus bAtkEle,Ele_Earth; }
+1757,Immaterial_Arrow,Immaterial Arrow,10,3,,1,30,,,,1706056,7,2,32768,,1,,1,{ bonus bAtkEle,Ele_Ghost; }
+1758,Stun_Arrow,Stun Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,1,{ bonus2 bAddEff,Eff_Stan,1000; }
+1759,Frozen_Arrow,Frozen Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,1,{ bonus bAtkEle,Ele_Water; bonus2 bAddEff,Eff_Freeze,1000; }
+1760,Flash_Arrow,Flash Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,1,{ bonus2 bAddEff,Eff_Blind,1000; }
+1761,Cursed_Arrow,Cursed Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,1,{ bonus2 bAddEff,Eff_Curse,1000; }
+1762,Rusty_Arrow,Rusty Arrow,10,3,,2,30,,,,1706056,7,2,32768,,1,,1,{ bonus bAtkEle,Ele_Poison; }
+1763,Poison_Arrow,Poison Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,1,{ bonus bAtkEle,Ele_Poison; bonus2 bAddEff,Eff_Poison,2000; }
+1764,Sharp_Arrow,Sharp Arrow,10,3,,3,10,,,,1706056,7,2,32768,,1,,1,{ bonus bCritical,10; }
+1765,Oridecon_Arrow,Oridecon Arrow,10,3,,3,50,,,,1706056,7,2,32768,,1,,1,{}
+1766,Arrow_of_Counter_Evil,Arrow of Counter Evil,10,40,,3,50,,,,1706056,7,2,32768,,1,,1,{ bonus bAtkEle,Ele_Holy; }
+1767,Arrow_of_Shadow,Shadow Arrow,10,3,,2,30,,,,1706056,7,2,32768,,1,,1,{ bonus bAtkEle,Ele_Dark; }
+1768,Sleep_Arrow,Sleep Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,1,{ bonus2 bAddEff,Eff_Sleep,2000; }
+1769,Mute_Arrow,Mute Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,1,{ bonus2 bAddEff,Eff_Silence,1000; }
+1770,Iron_Arrow,Iron Arrow,10,2,,1,30,,,,1706056,7,2,32768,,1,,1,{}
+1771,Venom_Knife,Venom Knife,10,50,,5,30,,,,4096,7,2,32768,,1,,2,{}
 // Knuckles
 1801,Waghnak,Waghnak,4,8000,,400,30,,1,3,33024,7,2,2,1,1,1,12,{}
 1802,Waghnak_,Waghnak,4,8000,,400,30,,1,4,33024,7,2,2,1,1,1,12,{}
@@ -2399,26 +2399,26 @@
 13162,Inferno,Inferno,4,230000,,1250,280,,9,1,134217728,7,2,34,2,65,1,21,{}
 
 // Bullets
-13200,Bullet,Bullet,10,1,,2,10,,,,134217728,7,2,32768,,1,,,{}
-13201,Silver_Bullet,Silver Bullet,10,15,,2,15,,,,134217728,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Holy; }
-13202,Shell_of_Blood,Shell of Blood,10,30,,2,30,,,,134217728,7,2,32768,,1,,,{ bonus2 bAddEff,Eff_Bleeding,50; }
-13203,Flare_Sphere,Flare Sphere,10,80,,5,50,,,,134217728,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Fire; }
-13204,Lightning_Sphere,Lightning Sphere,10,80,,5,50,,,,134217728,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Wind; }
-13205,Poison_Sphere,Poison Sphere,10,80,,5,50,,,,134217728,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Poision; bonus2 bAddEff,Eff_Poison,50; }
-13206,Blind_Sphere,Blind Sphere,10,80,,5,50,,,,134217728,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Dark; bonus2 bAddEff,Eff_Blind,50; }
-13207,Freezing_Sphere,Freezing Sphere,10,80,,5,50,,,,134217728,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Water; bonus2 bAddEff,Eff_Freeze,50; }
+13200,Bullet,Bullet,10,1,,2,10,,,,134217728,7,2,32768,,1,,3,{}
+13201,Silver_Bullet,Silver Bullet,10,15,,2,15,,,,134217728,7,2,32768,,1,,3,{ bonus bAtkEle,Ele_Holy; }
+13202,Shell_of_Blood,Shell of Blood,10,30,,2,30,,,,134217728,7,2,32768,,1,,4,{ bonus2 bAddEff,Eff_Bleeding,50; }
+13203,Flare_Sphere,Flare Sphere,10,80,,5,50,,,,134217728,7,2,32768,,1,,5,{ bonus bAtkEle,Ele_Fire; }
+13204,Lightning_Sphere,Lightning Sphere,10,80,,5,50,,,,134217728,7,2,32768,,1,,5,{ bonus bAtkEle,Ele_Wind; }
+13205,Poison_Sphere,Poison Sphere,10,80,,5,50,,,,134217728,7,2,32768,,1,,5,{ bonus bAtkEle,Ele_Poision; bonus2 bAddEff,Eff_Poison,50; }
+13206,Blind_Sphere,Blind Sphere,10,80,,5,50,,,,134217728,7,2,32768,,1,,5,{ bonus bAtkEle,Ele_Dark; bonus2 bAddEff,Eff_Blind,50; }
+13207,Freezing_Sphere,Freezing Sphere,10,80,,5,50,,,,134217728,7,2,32768,,1,,5,{ bonus bAtkEle,Ele_Water; bonus2 bAddEff,Eff_Freeze,50; }
 
 // Shurikens & Kunais
-13250,Shuriken,Shuriken,10,4,,5,10,,,,268435456,7,2,32768,,1,,,{}
-13251,Raincloud_Shuriken,Raincloud Shuriken,10,10,,5,30,,,,268435456,7,2,32768,,20,,,{}
-13252,Flash_Shuriken,Flash Shuriken,10,20,,5,45,,,,268435456,7,2,32768,,40,,,{}
-13253,Pointed_Leaf_Shuriken,Pointed Leaf Shuriken,10,40,,5,70,,,,268435456,7,2,32768,,60,,,{}
-13254,Piercing_Thorn_Shuriken,Piercing Thorn Shuriken,10,100,,5,100,,,,268435456,7,2,32768,,80,,,{}
-13255,Kunai_of_Frozen_Icicle,Kunai of Frozen Icicle,10,10,,20,30,,,,268435456,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Water; }
-13256,Kunai_of_Black_Earth,Kunai of Black Earth,10,10,,20,30,,,,268435456,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Earth; }
-13257,Kunai_of_Violent_Winds,Kunai of Violent Winds,10,10,,20,30,,,,268435456,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Wind; }
-13258,Kunai_of_Fierce_Heat,Kunai of Fierce Heat,10,10,,20,30,,,,268435456,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Fire; }
-13259,Kunai_of_Deadly_Poison,Kunai of Deadly Poison,10,10,,20,30,,,,268435456,7,2,32768,,1,,,{ bonus2 bAddEff,Eff_Poison,50; }
+13250,Shuriken,Shuriken,10,4,,5,10,,,,268435456,7,2,32768,,1,,6,{}
+13251,Raincloud_Shuriken,Raincloud Shuriken,10,10,,5,30,,,,268435456,7,2,32768,,20,,6,{}
+13252,Flash_Shuriken,Flash Shuriken,10,20,,5,45,,,,268435456,7,2,32768,,40,,6,{}
+13253,Pointed_Leaf_Shuriken,Pointed Leaf Shuriken,10,40,,5,70,,,,268435456,7,2,32768,,60,,6,{}
+13254,Piercing_Thorn_Shuriken,Piercing Thorn Shuriken,10,100,,5,100,,,,268435456,7,2,32768,,80,,6,{}
+13255,Kunai_of_Frozen_Icicle,Kunai of Frozen Icicle,10,10,,20,30,,,,268435456,7,2,32768,,1,,7,{ bonus bAtkEle,Ele_Water; }
+13256,Kunai_of_Black_Earth,Kunai of Black Earth,10,10,,20,30,,,,268435456,7,2,32768,,1,,7,{ bonus bAtkEle,Ele_Earth; }
+13257,Kunai_of_Violent_Winds,Kunai of Violent Winds,10,10,,20,30,,,,268435456,7,2,32768,,1,,7,{ bonus bAtkEle,Ele_Wind; }
+13258,Kunai_of_Fierce_Heat,Kunai of Fierce Heat,10,10,,20,30,,,,268435456,7,2,32768,,1,,7,{ bonus bAtkEle,Ele_Fire; }
+13259,Kunai_of_Deadly_Poison,Kunai of Deadly Poison,10,10,,20,30,,,,268435456,7,2,32768,,1,,7,{ bonus2 bAddEff,Eff_Poison,50; }
 
 // Ninja Stones
 7521,Burning_Stone,Burning Stone,3,70,,10,,,,,,7,2,,,,,,{}

db/skill_require_db.txt

@@ -56,8 +56,8 @@
 42,0,0,5,0,0,100:200:300:400:500:600:700:800:900:1000,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MC_MAMMONITE#メマ?ナイト#
 
 45,0,0,25:30:35:40:45:50:55:60:65:70,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//AC_CONCENTRATION#集中力向上#
-46,0,0,12,0,0,0,11,22,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//AC_DOUBLE#ダブルストレイフィング#
-47,0,0,15,0,0,0,11,22,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//AC_SHOWER#アロ?シャワ?#
+46,0,0,12,0,0,0,11,1,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//AC_DOUBLE#ダブルストレイフィング#
+47,0,0,15,0,0,0,11,1,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//AC_SHOWER#アロ?シャワ?#
 
 50,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//TF_STEAL#スティ?ル#
 51,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//TF_HIDING#ハイディング#
@@ -137,7 +137,7 @@
 
 146,0,0,5,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SM_AUTOBERSERK#オ?トバ?サ?ク#
 147,0,0,10,0,0,0,99,0,0,recover_weight_rate,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//AC_MAKINGARROW#矢作成#
-148,0,0,15,0,0,0,11,22,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//AC_CHARGEARROW#チャ?ジアロ?#
+148,0,0,15,0,0,0,11,1,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//AC_CHARGEARROW#チャ?ジアロ?#
 149,0,0,9,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//TF_SPRINKLESAND#砂まき#
 150,0,0,7,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//TF_BACKSLIDING#バックステップ#
 151,0,0,3,0,0,0,99,0,0,recover_weight_rate,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//TF_PICKSTONE#石拾い#
@@ -239,7 +239,7 @@
 312,0,0,10,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//BD_INTOABYSS#深淵の中に#
 313,0,0,20,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//BD_SIEGFRIED#不死身のジ?クフリ?ド#
 
-316,0,0,1:3:5:7:9,0,0,0,13,22,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//BA_MUSICALSTRIKE#ミュ?ジカルストライク#
+316,0,0,1:3:5:7:9,0,0,0,13,1,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//BA_MUSICALSTRIKE#ミュ?ジカルストライク#
 317,0,0,18:21:24:27:30,0,0,0,13,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//BA_DISSONANCE#不協和音#
 318,0,0,12:14:16:18:20,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//BA_FROSTJOKE#寒いジョ?ク#
 319,0,0,24:28:32:36:40:44:48:52:56:60,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//BA_WHISTLE#口笛#
@@ -247,7 +247,7 @@
 321,0,0,40:45:50:55:60:65:70:75:80:85,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//BA_POEMBRAGI#ブラギの詩#
 322,0,0,40:45:50:55:60:65:70:75:80:85,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//BA_APPLEIDUN#イドゥンの林檎#
 
-324,0,0,1:3:5:7:9,0,0,0,14,22,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//DC_THROWARROW#矢?ち#
+324,0,0,1:3:5:7:9,0,0,0,14,1,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//DC_THROWARROW#矢?ち#
 325,0,0,23:26:29:32:35,0,0,0,14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//DC_UGLYDANCE#自分勝手なダンス#
 326,0,0,12:14:16:18:20,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//DC_SCREAM#スクリ?ム#
 327,0,0,22:24:26:28:30:32:34:36:38:40,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//DC_HUMMING#ハミング#
@@ -284,7 +284,7 @@
 379,0,0,20:20:20:20:20:30:30:30:30:30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//ASC_BREAKER#ソウルブレ?カ?#
 380,0,0,20:20:25:25:30:30:35:35:40:40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SN_SIGHT#トゥル?サイト#
 381,0,0,30:34:38:42:46,0,0,0,99,0,0,falcon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SN_FALCONASSAULT#ファルコンアサルト#
-382,0,0,18:21:24:27:30,0,0,0,11,22,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0		//SN_SHARPSHOOTING#シャ?プシュ?ティング#
+382,0,0,18:21:24:27:30,0,0,0,11,1,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0		//SN_SHARPSHOOTING#シャ?プシュ?ティング#
 383,0,0,46:52:58:64:70:76:82:88:94:100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SN_WINDWALK#ウインドウォ?ク#
 384,0,0,50:50:60:60:70:70:80:80:90:90,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//WS_MELTDOWN#メルトダウン#
 385,0,0,5,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//WS_CREATECOIN#クリエイトコイン#
@@ -294,7 +294,7 @@
 389,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//ST_CHASEWALK#チェイスウォ?ク#
 390,0,0,10:15:20:25:30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//ST_REJECTSWORD#リジェクトソ?ド#
 
-394,0,0,12:14:16:18:20:22:24:26:28:30,0,0,0,13:14,22,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//CG_ARROWVULCAN#アロ?バルカン#
+394,0,0,12:14:16:18:20:22:24:26:28:30,0,0,0,13:14,1,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//CG_ARROWVULCAN#アロ?バルカン#
 395,0,0,30:40:50:60:70,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//CG_MOONLIT#月明りの泉に落ちる花びら#
 396,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//CG_MARIONETTE#マリオネットコントロ?ル#
 397,0,0,18:21:24:27:30,0,0,0,4:5,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//LK_SPIRALPIERCE#スパイラルピア?ス#
@@ -388,30 +388,30 @@
 496,0,0,200,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//AM_TWILIGHT1#ト�?イライトファ?[マシ?[1#
 497,0,0,200,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//AM_TWILIGHT2#ト�?イライトファ?[マシ?[2#
 498,0,0,200,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0//AM_TWILIGHT3#ト�?イライトファ?[マシ?[3#
-499,0,0,8,0,0,0,11,22,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//HT_POWER#ビ?[ストストレイピング#
+499,0,0,8,0,0,0,11,1,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//HT_POWER#ビ?[ストストレイピング#
 //temp plugs
 500,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_GLITTERING
 501,0,0,10,0,0,0,17:18:19:20:21,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_FLING
-502,0,0,10,0,0,0,17:18:19:20:21,0,0,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_TRIPLEACTION
-503,0,0,10,0,0,0,17:18:19:20:21,0,0,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_BULLSEYE
+502,0,0,10,0,0,0,17:18:19:20:21,3:4:5,1,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_TRIPLEACTION
+503,0,0,10,0,0,0,17:18:19:20:21,3:4:5,1,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_BULLSEYE
 504,0,0,10,0,0,0,17:18:19:20:21,0,0,none,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_MADNESSCANCEL
 505,0,0,15,0,0,0,17:18:19:20:21,0,0,none,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_ADJUSTMENT
 506,0,0,10,0,0,0,17:18:19:20:21,0,0,none,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_INCREASING
 507,0,0,7,0,0,0,17:18:19:20:21,0,0,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_MAGICALBULLET
-508,0,0,10,0,0,0,17:18:19:20:21,0,0,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_CRACKER
-512,0,0,15:20:25:30:35:40:45:50:55:60,0,0,0,17:18,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_TRACKING
-513,0,0,15:20:25:30:35,0,0,0,17:18,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_DISARM
-514,0,0,11:12:13:14:15,0,0,0,17:18,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_PIERCINGSHOT
-515,0,0,22:24:26:28:30:32:34:36:38:40,0,0,0,17,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_RAPIDSHOWER
-516,0,0,32:34:36:38:40:42:44:46:48:50,0,0,0,17,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_DESPERADO
+508,0,0,10,0,0,0,17:18:19:20:21,3:4:5,1,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_CRACKER
+512,0,0,15:20:25:30:35:40:45:50:55:60,0,0,0,17:18,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_TRACKING
+513,0,0,15:20:25:30:35,0,0,0,17:18,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_DISARM
+514,0,0,11:12:13:14:15,0,0,0,17:18,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_PIERCINGSHOT
+515,0,0,22:24:26:28:30:32:34:36:38:40,0,0,0,17,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_RAPIDSHOWER
+516,0,0,32:34:36:38:40:42:44:46:48:50,0,0,0,17,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_DESPERADO
 517,0,0,30:32:34:36:38:40:42:44:46:48,0,0,0,20,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_GATLINGFEVER
-518,0,0,3:6:9:12:15:18:21:24:27:30,0,0,0,19,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_DUST
-519,0,0,20:25:30:35:40:45:50:55:60:65,0,0,0,19,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_FULLBUSTER
-520,0,0,15:20:25:30:35:40:45:50:55:60,0,0,0,19,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_SPREADATTACK
-521,0,0,4:8:12:16:20:24:28:32:36:40,0,0,0,21,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_GROUNDDRIFT
-523,0,0,10,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_SYURIKEN
-524,0,0,10,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_KUNAI
-525,0,0,20:25:30:35:40,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_HUUMA
+518,0,0,3:6:9:12:15:18:21:24:27:30,0,0,0,19,4,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_DUST
+519,0,0,20:25:30:35:40:45:50:55:60:65,0,0,0,19,4,1:2:3:4:5:6:7:8:9:10,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_FULLBUSTER
+520,0,0,15:20:25:30:35:40:45:50:55:60,0,0,0,19,4,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_SPREADATTACK
+521,0,0,4:8:12:16:20:24:28:32:36:40,0,0,0,21,5,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_GROUNDDRIFT
+523,0,0,10,0,0,0,0,6,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_SYURIKEN
+524,0,0,10,0,0,0,0,7,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_KUNAI
+525,0,0,20:25:30:35:40,0,0,0,0,6,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_HUUMA
 526,0,0,50,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_ZENYNAGE
 527,0,0,40,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_TATAMIGAESHI
 528,0,0,10:12:14:16:18:20:22:24:26:28,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_KASUMIKIRI
@@ -434,7 +434,7 @@
 
 1001,0,0,40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//KN_CHARGEATK#チャ?[ジアタック#
 1002,0,0,15,0,0,0,99,0,0,shield,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//CR_SHRINK#シュリンク#
-1004,0,0,15,0,0,0,99,0,0,none,0,1771,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//AS_VENOMKNIFE#ベナムナイフ#
+1004,0,0,15,0,0,0,99,2,1,none,0,1771,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//AS_VENOMKNIFE#ベナムナイフ#
 1005,0,0,25,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RG_CLOSECONFINE#ク�??[ズコンファイン#
 1006,0,0,40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//WZ_SIGHTBLASTER#サイトブラスタ?[#
 1007,0,0,30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SA_CREATECON#エルレ�?ンタルコンバ?[タ?ｻ造#

src/map/status.c

@@ -5864,28 +5864,34 @@ int status_readdb(void) {
 		ShowError("can't read %s\n", path);
 		return 1;
 	}
+	i = 0;
 	while(fgets(line, sizeof(line)-1, fp)){
-		char *split[MAX_WEAPON_TYPE + 6];
+		char *split[MAX_WEAPON_TYPE + 5];
+		i++;
 		if(line[0]=='/' && line[1]=='/')
 			continue;
-		for(j=0,p=line;j< (MAX_WEAPON_TYPE + 6) && p;j++){	//not 22 anymore [blackhole89]
+		for(j=0,p=line;j<(MAX_WEAPON_TYPE + 5) && p;j++){	//not 22 anymore [blackhole89]
 			split[j]=p;
 			p=strchr(p,',');
 			if(p) *p++=0;
 		}
-		if(j < MAX_WEAPON_TYPE + 6)	//Weapon #.MAX_WEAPON_TYPE is constantly not load. Fix to that: replace < with <= [blackhole89]
+		if(j < MAX_WEAPON_TYPE + 5)
+		{	//Weapon #.MAX_WEAPON_TYPE is constantly not load. Fix to that: replace < with <= [blackhole89]
+			ShowDebug("%s: Not enough columns at line %d\n", i, j);
 			continue;
+		}
 		if(atoi(split[0])>=MAX_PC_CLASS)
 			continue;
+		
 		max_weight_base[atoi(split[0])]=atoi(split[1]);
 		hp_coefficient[atoi(split[0])]=atoi(split[2]);
 		hp_coefficient2[atoi(split[0])]=atoi(split[3]);
 		sp_coefficient[atoi(split[0])]=atoi(split[4]);
-		for(j=0;j<=MAX_WEAPON_TYPE;j++)
+		for(j=0;j<MAX_WEAPON_TYPE;j++)
 			aspd_base[atoi(split[0])][j]=atoi(split[j+5]);
 	}
 	fclose(fp);
-	ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n","job_db1.txt");
+	ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n",path);
 
 	memset(job_bonus,0,sizeof(job_bonus)); // Job-specific stats bonus
 	sprintf(path, "%s/job_db2.txt", db_path);