Follow-up to 8d20393 and a63b031

* Thunder Storm, Exploding Dragon, Lightning Jolt and Snowflake Draft can now damage more than just once every 500ms
* Fixed a problem with negative aftercast delay

db/pre-re/skill_cast_db.txt

@@ -50,7 +50,7 @@
 //-- MG_LIGHTNINGBOLT
 20,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0
 //-- MG_THUNDERSTORM
-21,1000:2000:3000:4000:5000:6000:7000:8000:9000:10000,2000,0,500,0,0
+21,1000:2000:3000:4000:5000:6000:7000:8000:9000:10000,2000,0,100,0,0
 //==========================================
 
 
@@ -175,7 +175,7 @@
 //-- WZ_EARTHSPIKE
 90,1000:2000:3000:4000:5000,700,0,0,0,0
 //-- WZ_HEAVENDRIVE
-91,1000:2000:3000:4000:5000,700,0,500,0,0
+91,1000:2000:3000:4000:5000,700,0,100,0,0
 //-- WZ_QUAGMIRE
 92,0,1000,0,5000:10000:15000:20000:25000,5000:10000:15000:20000:25000,0
 //==========================================
@@ -886,17 +886,17 @@
 //-- NJ_KAENSIN
 535,6000:5500:5000:4500:4000:3500:3000:2500:2000:1500,1000,0,20000,0,0
 //-- NJ_BAKUENRYU
-536,3000,2000,0,500,0,0
+536,3000,2000,0,100,0,0
 //-- NJ_HYOUSENSOU
 537,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,0,0,0,0,0
 //-- NJ_SUITON
 538,3000,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0
 //-- NJ_HYOUSYOURAKU
-539,2000:2500:3000:3500:4000,2000,0,500,7500:12500:17500:22500:27500,0
+539,2000:2500:3000:3500:4000,2000,0,100,7500:12500:17500:22500:27500,0
 //-- NJ_HUUJIN
 540,1000:1500:2000:2500:3000:3500:4000:4500:5000:5500,1000,0,0,0,0
 //-- NJ_RAIGEKISAI
-541,4000,0,0,500,0,0
+541,4000,0,0,100,0,0
 //-- NJ_KAMAITACHI
 542,4000,0,0,0,0,0
 //-- NJ_NEN

db/pre-re/skill_unit_db.txt

@@ -33,7 +33,7 @@
 
  12,0x7e,    ,  0, 0,  -1,all,   0x4003	//MG_SAFETYWALL
  18,0x7f,    , -1, 0,  20,enemy, 0x8010	//MG_FIREWALL
- 21,0x86,    ,  0, 2:2:2:2:2:2:2:2:2:2:3,1000,enemy, 0x018	//MG_THUNDERSTORM
+ 21,0x86,    ,  0, 2:2:2:2:2:2:2:2:2:2:3,1000,enemy, 0x010	//MG_THUNDERSTORM
  25,0x85,    ,  1, 0,  -1,all,   0x6003	//AL_PNEUMA
  27,0x81,0x80,  0, 0,  -1,all,   0x00E	//AL_WARP
  47,0x86,    ,  0, 2,1000,enemy, 0x080	//AC_SHOWER
@@ -101,10 +101,10 @@
 521,0xbe,    ,  0, 1,1000,enemy, 0x000	//GS_GROUNDDRIFT
 527,0xbc,    , -1, 0,2000,enemy, 0x018	//NJ_TATAMIGAESHI
 535,0xbd,    , -1, 0, 100,enemy, 0x8010	//NJ_KAENSIN
-536,0x86,    ,  2, 0,1000,enemy, 0x018	//NJ_BAKUENRYU
+536,0x86,    ,  2, 0,1000,enemy, 0x010	//NJ_BAKUENRYU
 538,0xbb,    ,  1:1:1:2:2:2:3:3:3:4,0,-1,all,0x8010	//NJ_SUITON
-539,0x86,    ,  3, 0,1000,enemy, 0x018	//NJ_HYOUSYOURAKU
-541,0x86,    ,  2:2:3:3:4, 0,1000,enemy, 0x018	//NJ_RAIGEKISAI
+539,0x86,    ,  3, 0,1000,enemy, 0x010	//NJ_HYOUSYOURAKU
+541,0x86,    ,  2:2:3:3:4, 0,1000,enemy, 0x010	//NJ_RAIGEKISAI
 670,0xc7,    ,  1, 5:5:5:5:5:5:5:5:5:13,1000,all,0x008	//NPC_EVILLAND
 
 //706,0xfd,    ,  0, 0,1000,all, 0x000	//NPC_VENOMFOG

db/re/skill_cast_db.txt

@@ -51,7 +51,7 @@
 //-- MG_LIGHTNINGBOLT
 20,640:960:1280:1600:1920:2100:1560:2880:3200:3520,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0,160:240:320:400:480:700:640:720:800:880
 //-- MG_THUNDERSTORM
-21,640:1280:1920:2560:3200:3840:4480:5120:5760:6400,2000,0,500,0,0,160:320:480:640:800:960:1120:1280:1440:1600
+21,640:1280:1920:2560:3200:3840:4480:5120:5760:6400,2000,0,100,0,0,160:320:480:640:800:960:1120:1280:1440:1600
 //==========================================
 
 
@@ -176,7 +176,7 @@
 //-- WZ_EARTHSPIKE
 90,448:896:1344:1792:2240,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0,112:224:336:448:560
 //-- WZ_HEAVENDRIVE
-91,640:1280:1920:2560:3200,1000,0,500,0,0,160:320:480:640:800
+91,640:1280:1920:2560:3200,1000,0,100,0,0,160:320:480:640:800
 //-- WZ_QUAGMIRE
 92,0,1000,0,5000:10000:15000:20000:25000,5000:10000:15000:20000:25000,0,0
 //==========================================
@@ -899,17 +899,17 @@
 //-- NJ_KAENSIN
 535,4800:4400:4000:3600:3200:2800:2400:2000:1600:1200,1000,0,20000,0,0,1200:1100:1000:900:800:700:600:500:400:300
 //-- NJ_BAKUENRYU
-536,2400,2000,0,500,0,0,600
+536,2400,2000,0,100,0,0,600
 //-- NJ_HYOUSENSOU
 537,560:1120:1680:2240:2800:3360:3840:4480:5040:5600,0,0,0,0,0,140:280:420:560:700:840:960:1120:1260:1400
 //-- NJ_SUITON
 538,2400,2000,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0,600
 //-- NJ_HYOUSYOURAKU
-539,1600:2000:2400:2800:3200,2000,0,500,7500:12500:17500:22500:27500,0,400:500:600:700:800
+539,1600:2000:2400:2800:3200,2000,0,100,7500:12500:17500:22500:27500,0,400:500:600:700:800
 //-- NJ_HUUJIN
 540,800:1200:1600:2000:2400:2800:3200:3600:4000:4400,1000,0,0,0,0,200:300:400:500:600:700:800:900:1000:1100
 //-- NJ_RAIGEKISAI
-541,3200,0,0,500,0,0,800
+541,3200,0,0,100,0,0,800
 //-- NJ_KAMAITACHI
 542,3200,0,0,0,0,0,800
 //-- NJ_NEN

db/re/skill_unit_db.txt

@@ -33,7 +33,7 @@
 
  12,0x7e,    ,  0, 0,  -1,all,   0x4003	//MG_SAFETYWALL
  18,0x7f,    , -1, 0,  20,enemy, 0x8010	//MG_FIREWALL
- 21,0x86,    ,  0, 2:2:2:2:2:2:2:2:2:2:3,1000,enemy, 0x018	//MG_THUNDERSTORM
+ 21,0x86,    ,  0, 2:2:2:2:2:2:2:2:2:2:3,1000,enemy, 0x010	//MG_THUNDERSTORM
  25,0x85,    ,  1, 0,  -1,all,   0x6003	//AL_PNEUMA
  27,0x81,0x80,  0, 0,  -1,all,   0x00E	//AL_WARP
  47,0x86,    ,  0, 1:1:1:1:1:2:2:2:2:2,1000,enemy, 0x080	//AC_SHOWER
@@ -102,10 +102,10 @@
 525,0x86,    ,  0, 2,1000,enemy, 0x018	//NJ_HUUMA
 527,0xbc,    , -1, 0,2000,enemy, 0x018	//NJ_TATAMIGAESHI
 535,0xbd,    , -1, 0, 100,enemy, 0x8010	//NJ_KAENSIN
-536,0x86,    ,  2, 0,1000,enemy, 0x018	//NJ_BAKUENRYU
+536,0x86,    ,  2, 0,1000,enemy, 0x010	//NJ_BAKUENRYU
 538,0xbb,    ,  1:1:1:2:2:2:3:3:3:4,0,-1,all,0x8010	//NJ_SUITON
-539,0x86,    ,  3, 0,1000,enemy, 0x018	//NJ_HYOUSYOURAKU
-541,0x86,    ,  1:1:2:2:3, 0,1000,enemy, 0x018	//NJ_RAIGEKISAI
+539,0x86,    ,  3, 0,1000,enemy, 0x010	//NJ_HYOUSYOURAKU
+541,0x86,    ,  1:1:2:2:3, 0,1000,enemy, 0x010	//NJ_RAIGEKISAI
 670,0xc7,    ,  1, 5:5:5:5:5:5:5:5:5:13,1000,all,0x008	//NPC_EVILLAND
 
 //706,0xfd,    ,  0, 0,1000,all, 0x000	//NPC_VENOMFOG

src/map/skill.c

@@ -16220,7 +16220,7 @@ int skill_delayfix(struct block_list *bl, uint16 skill_id, uint16 skill_lv)
 
 	//ShowInfo("Delay delayfix = %d\n",time);
 
-	return time;
+	return max(time,0);
 }