* updated map server to jA1137~1159

* Some tidying up in mob.c and skill.c

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

5 files changed, 18 insertions, 18 deletions

diff --git a/db/packet_db.txt b/db/packet_db.txt
index 95591eacf..81bcf2c89 100644
--- a/db/packet_db.txt
+++ b/db/packet_db.txt
@@ -237,7 +237,7 @@ prefer_packet_db: yes
 0x013c,4
 0x013d,6
 0x013e,24
-0x013f,26
+0x013F,26,itemmonster,2
 0x0140,22,mapmove,2:18:20
 0x0141,14
 0x0142,6
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index 247c77a25..d1b62cf0c 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -2,7 +2,7 @@
 //id,cast_list,delay_list,upkeep_time,upkeep_time2
 
 6,0,0,30000,0	//SM_PROVOKE#プロボック#
-
+7,0,2000,0,0	//SM_MAGNUM#マグナムブレイク#
 8,0,0,10000:13000:16000:19000:22000:25000:28000:31000:34000:37000,0	//SM_ENDURE#インデュア#
 
 10,0,0,10000,0		//MG_SIGHT#サイト#
@@ -156,7 +156,7 @@
 252,0,0,300000,0	//CR_REFLECTSHIELD#リフレクトシールド#
 253,0,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000	//CR_HOLYCROSS#ホーリークロス#
 254,3000,1500,1000,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000	//CR_GRANDCROSS#グランドクロス#
-
+255,3000,0,0,0	//CR_DEVOTION#ディボーション
 256,3000,0,180000,0	//CR_PROVIDENCE#プロヴィデンス#
 257,0,800,180000,0	//CR_DEFENDER#ディフェンダー#
 258,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0	//CR_SPEARQUICKEN#スピアクイッケン#
@@ -232,7 +232,7 @@
 365,300,300,0,0	//HW_MAGICCRASHER
 366,700,0,30000,0	//HW_MAGICPOWER#魔法力増幅#
 367,2000:2500:3000:3500:4000,2000:3000:4000:5000:6000,0,2000:3000:4000:5000:6000	//PA_PRESSURE
-369,0,0,100000,0	//PA_GOSPEL#ゴスペル#
+369,0,0,60000,20000	//PA_GOSPEL#ゴスペル#
 370,0,300,0,0 //CH_PALMSTRIKE 
 371,0,0,0,2000:4000:6000:8000:10000	//CH_TIGERFIST#伏虎拳#
 372,0,800:800:800:800:800:1000:1000:1000:1000:1000,0,0	//CH_CHAINCRUSH#連柱崩撃#
diff --git a/db/skill_db.txt b/db/skill_db.txt
index ac6acb17f..a1ed5b27f 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -6,7 +6,7 @@
 4,0,0,0,0,0,10,0,no,0,0,0,none,0	//SM_RECOVERY#HP回復力向上#
 5,-1,6,1,0,0,10,1,no,0,0,0,weapon,0	//SM_BASH#バッシュ#
 6,8,6,1,0,1,10,1,no,0,0,0,none,0	//SM_PROVOKE#プロ?ック#
-7,0,6,4,3,2,10,5,no,0,0,0,weapon,2	//SM_MAGNUM#?グナ?ブレイク#
+7,0,6,4,3,2,10,5,no,0,16,0,weapon,2	//SM_MAGNUM#?グナ?ブレイク#
 8,0,6,4,0,1,10,1,no,0,0,0,weapon,0	//SM_ENDURE#インデュア#
 9,0,0,0,0,0,10,0,no,0,0,0,none,0	//MG_SRECOVERY#SP回復力向上#
 10,8,6,4,3,1,1,1,yes,0,0,0,magic,0	//MG_SIGHT#サイト#
@@ -264,10 +264,10 @@
 212,-1,6,1,0,0,10,1,no,0,0,0,weapon,1	//RG_BACKSTAP#バックス?ブ#
 213,0,0,0,0,0,5,0,no,0,0,0,none,0	//RG_TUNNELDRIVE#トンネルドライブ#
 214,0,6,4,0,1,5,1,no,0,0,0,weapon,0	//RG_RAID#サプライズア?ック#
-215,1,6,1,0,1,5,1,yes,0,0,0,weapon,0	//RG_STRIPWEAPON#ストリップウェ?ン#
-216,1,6,1,0,1,5,1,yes,0,0,0,weapon,0	//RG_STRIPSHIELD#ストリップシ?ルド#
-217,1,6,1,0,1,5,1,yes,0,0,0,weapon,0	//RG_STRIPARMOR#ストリップア???#
-218,1,6,1,0,1,5,1,yes,0,0,0,weapon,0	//RG_STRIPHELM#ストリップヘル?#
+215,1,6,1,0,1,5,1,no,0,0,0,weapon,0	//RG_STRIPWEAPON#ストリップウェ?ン#
+216,1,6,1,0,1,5,1,no,0,0,0,weapon,0	//RG_STRIPSHIELD#ストリップシ?ルド#
+217,1,6,1,0,1,5,1,no,0,0,0,weapon,0	//RG_STRIPARMOR#ストリップア???#
+218,1,6,1,0,1,5,1,no,0,0,0,weapon,0	//RG_STRIPHELM#ストリップヘル?#
 219,-1,6,1,0,0,5,1,no,0,0,0,weapon,0	//RG_INTIMIDATE#インティ?デイト#
 220,1,6,2,0,1,1,1,no,0,0,0,none,0	//RG_GRAFFITI#グラフィティ#
 221,0,6,2,0,1,5,1,no,0,0,0,none,0	//RG_FLAGGRAFFITI#フラッググラフィティ#
@@ -278,8 +278,8 @@
 226,0,0,0,0,0,10,0,no,0,0,0,weapon,0	//AM_AXEMASTERY#?修練#
 227,0,0,0,0,0,10,0,no,0,0,0,none,0	//AM_LEARNINGPOTION#ラ?ニング??ション#
 228,0,6,4,0,1,10,0,no,0,0,0,none,0	//AM_PHARMACY#フ???シ?#
-229,8,6,2,3,1,5,1,no,0,128,0,weapon,0	//AM_DEMONSTRATION#デモンストレ?ション#
-230,8,6,1,0,0,5,0,no,0,0,0,weapon,0	//AM_ACIDTERROR#アシッドテラ?#
+229,8,6,2,3,1,5,1,yes,0,128,0,weapon,0	//AM_DEMONSTRATION#デモンストレ?ション#
+230,8,6,1,0,0,5,0,yes,0,0,0,weapon,0	//AM_ACIDTERROR#アシッドテラ?#
 231,8,6,16,0,1,5,1,yes,0,3072,0,none,0	//AM_POTIONPITCHER#??ションピッ?ャ?#
 232,3,6,2,0,1,5,1,no,0,0,5,none,0	//AM_CANNIBALIZE#バイオプラント#
 233,3,6,2,0,1,5,1,no,0,128,3,none,0	//AM_SPHEREMINE#スフィア??イン#
@@ -303,7 +303,7 @@
 251,3:5:7:9:11,6,1,0,0,5,1,no,0,0,0,weapon,0	//CR_SHIELDBOOMERANG#シ?ルドブ?メラン#
 252,0,6,4,0,1,10,1,no,0,0,0,weapon,0	//CR_REFLECTSHIELD#リフレクトシ?ルド#
 253,-2,8,1,6,0,10,2,no,0,0,0,weapon,0	//CR_HOLYCROSS#ホ?リ?クロス#
-254,0,6,4,6,0,10,1,no,33,256,0,magic,0	//CR_GRANDCROSS#グランドクロス#
+254,0,5,4,6,0,10,1,no,33,256,0,magic,0	//CR_GRANDCROSS#グランドクロス#
 255,8,6,16,0,1,5,1,yes,0,0,0,magic,0	//CR_DEVOTION#ディ??ション#
 256,8,6,16,0,1,5,1,yes,0,0,0,magic,0	//CR_PROVIDENCE#プロヴィデンス#
 257,0,6,4,0,1,5,1,no,0,0,0,weapon,0	//CR_DEFENDER#ディフェン??#
@@ -404,13 +404,13 @@
 //345兜壊し
 //346盾壊し
 //347不死属性攻撃
-//348攻撃系エフェクト（後退？）
+348,2,6,4,0,1,20,0,no,0,0,0,magic,0	//NPC_RUNAWAY#後退#
 349,0,6,4,0,1,5,0,no,0,0,0,weapon,0	//NPC_EXPLOSIONSPIRITS#NPC爆裂波動#
 //350速度増加エフェクト
 //351攻撃系スキルエフェクト
 //352攻撃系スキルエフェクト
 //353攻撃系スキルエフェクト
-//354攻撃系スキルエフェクト
+354,2,0,4,0,1,1,0,no,0,0,0,magic,0	//NPC_RECALL#取り巻き呼び戻し#
 
 355,0,6,4,0,1,5,1,no,0,0,0,weapon,0	//LK_AURABLADE#オ?ラブレ?ド#
 356,0,6,4,0,1,10,1,no,0,0,0,weapon,0	//LK_PARRYING#パリイング#
@@ -436,7 +436,7 @@
 376,0,0,0,0,1,5,1,no,0,0,0,weapon,0	//ASC_KATAR#アドバンスドカ??ル研究#
 377,0,0,4,0,1,10,1,no,0,0,0,misc,0	//ASC_HALLUCINATION#ハルシネ?ションウォ?ク#
 378,0,6,4,5,1,5,1,no,0,1024,0,weapon,0	//ASC_EDP#エン?ャントデッドリ??イズン#
-379,5,6,1,0,0,10,1,no,0,0,0,weapon,0	//ASC_BREAKER#?ウルブレ?カ?#
+379,9,6,1,0,0,10,1,yes,0,0,0,weapon,0	//ASC_BREAKER#?ウルブレ?カ?#
 380,0,6,4,0,1,10,1,no,0,0,0,weapon,0	//SN_SIGHT#トゥル?サイト#
 381,9,8,1,0,0,5,1:2:3:4:5,yes,0,0,0,misc,0	//SN_FALCONASSAULT#フ?ルコンアサルト#
 382,14,8,1,0,0,5,1,no,0,0,0,weapon,0	//SN_SHARPSHOOTING#シャ?プシュ?ティング#
@@ -454,7 +454,7 @@
 394,8,8,1,0,0,10,9,no,0,0,0,weapon,0	//CG_ARROWVULCAN#アロ?バルカン#
 395,0,0,4,0,1,1,1,yes,0,0,0,magic,0	//CG_MOONLIT#月明りの泉に落ちる花びら#
 396,0,6,16,0,1,1,1,yes,0,0,0,magic,1	//CG_MARIONETTE#?リオネットコントロ?ル#
-397,4,8,1,0,0,5,5,no,0,0,0,weapon,0	//LK_SPIRALPIERCE#スパイラルピア?ス#
+397,5,8,1,0,0,5,5,no,0,0,0,weapon,0	//LK_SPIRALPIERCE#スパイラルピア?ス#
 398,4,6,1,0,0,5,1,no,0,0,0,weapon,0	//LK_HEADCRUSH#ヘッドクラッシュ#
 399,4,6,1,0,0,10,1,no,0,0,0,weapon,0	//LK_JOINTBEAT#ジョイントビ?ト#
 400,8,8,1,8,0,5,1:2:3:4:5,yes,0,0,0,magic,0	//HW_NAPALMVULCAN#ナパ??バルカン#
diff --git a/db/skill_require_db.txt b/db/skill_require_db.txt
index 50578ac49..2cccdfe72 100644
--- a/db/skill_require_db.txt
+++ b/db/skill_require_db.txt
@@ -3,7 +3,7 @@
 
 5,0,0,8:8:8:8:8:15:15:15:15:15,0,0,0,0:1:2:3:4:5:6:7:8:9:10:12:13:14:15:16:17:18:19:20:21:22,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SM_BASH#バッシュ#
 6,0,0,4:5:6:7:8:9:10:11:12:13,0,0,0,99,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SM_PROVOKE#プロボック#
-7,15,0,15,0,0,0,0:1:2:3:4:5:6:7:8:9:10:12:13:14:15:16:17:18:19:20:21:22,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SM_MAGNUM#マグナムブレイク#
+7,20:20:19:19:18:18:17:17:16:16,0,30,0,0,0,99,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SM_MAGNUM#マグナムブレイク#
 8,0,0,10,0,0,0,99,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SM_ENDURE#インデュア#
 
 10,0,0,10,0,0,0,99,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MG_SIGHT#サイト#
diff --git a/db/skill_unit_db.txt b/db/skill_unit_db.txt
index e9e7dffaf..800548745 100644
--- a/db/skill_unit_db.txt
+++ b/db/skill_unit_db.txt
@@ -75,6 +75,6 @@
 336,0xb2,    ,  0,-1,  -1,all,   0x000,0	//WE_CALLPARTNER#あなたに逢いたい
 339,0x86,    , -1, 0, 300,enemy, 0x000,0	//NPC_DARKGRANDCROSS#闇グランドクロス
 362,0xb4,    ,  0, 3, 300,all,   0x000,0	//HP_BASILICA#バジリカ
-369,0xb3,    ,  3, 0,  -1,all,   0x000,0	//PA_GOSPEL#ゴスペル
+369,0xb3,    , -1, 0,10000,all,  0x000,0	//PA_GOSPEL#ゴスペル
 404,0xb6,    , -1, 0,  -1,all,   0x000,0	//PF_FOGWALL#フォグウォール
 405,0xb7,    ,  0, 1,1000,enemy, 0x006,0	//PF_SPIDERWEB#スパイダーウェッブ