Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Official status change base durations for Freeze and Blind (fixes #988)

Browse Source 
* Snowflake Draft now has a skill-specific duration of 5s*level
* All freeze durations (default and skill-specific) are increased by 2.5s in renewal
* The renewal default duration is now 27.5s (+2.5s)
* Items, Storm Gust, Frost Joke, NPC_ICEBREATH and NPC_WIDEFREEZE use the default freeze duration
* All items and skills that cause blind now have a base duration of 30s in pre-re and 20s in renewal
* Fixed NPC_DARKCROSS and NPC_GRANDDARKNESS not giving the blind status change
This commit is contained in:
Playtester 2016-02-28 01:03:14 +01:00
parent 35d3c971a3
commit ec59446043
3 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
db/pre-re/skill_cast_db.txt
View File

@ -135,7 +135,7 @@
//-- PR_SLOWPOISON //-- PR_SLOWPOISON
71,0,0,0,10000:20000:30000:40000,0,0 71,0,0,0,10000:20000:30000:40000,0,0
//-- PR_STRECOVERY //-- PR_STRECOVERY
72,0,2000,0,0,20000,0 72,0,2000,0,0,30000,0
//-- PR_KYRIE //-- PR_KYRIE
73,2000,2000,0,120000,0,0 73,2000,2000,0,120000,0,0
//-- PR_MAGNIFICAT //-- PR_MAGNIFICAT
@ -163,7 +163,7 @@
//-- WZ_JUPITEL //-- WZ_JUPITEL
84,2500:3000:3500:4000:4500:5000:5500:6000:6500:7000,0,0,0,0,0 84,2500:3000:3500:4000:4500:5000:5500:6000:6500:7000,0,0,0,0,0
//-- WZ_VERMILION //-- WZ_VERMILION
85,15000:14500:14000:13500:13000:12500:12000:11500:11000:10500,5000,0,4000,5500:6000:6500:7000:7500:8000:8500:9000:9500:10000,0 85,15000:14500:14000:13500:13000:12500:12000:11500:11000:10500,5000,0,4000,30000,0
//-- WZ_WATERBALL //-- WZ_WATERBALL
86,1000:2000:3000:4000:5000:6000:7000:8000:9000:10000,0,0,10000,0,0 86,1000:2000:3000:4000:5000:6000:7000:8000:9000:10000,0,0,10000,0,0
//-- WZ_ICEWALL //-- WZ_ICEWALL
@ -209,7 +209,7 @@
//-- HT_SANDMAN //-- HT_SANDMAN
119,0,0,0,150000:120000:90000:60000:30000,12000:14000:16000:18000:20000,0 119,0,0,0,150000:120000:90000:60000:30000,12000:14000:16000:18000:20000,0
//-- HT_FLASHER //-- HT_FLASHER
120,0,0,0,150000:120000:90000:60000:30000,10000:11000:12000:13000:14000,0 120,0,0,0,150000:120000:90000:60000:30000,30000,0
//-- HT_FREEZINGTRAP //-- HT_FREEZINGTRAP
121,0,0,0,150000:120000:90000:60000:30000,3000:6000:9000:12000:15000,0 121,0,0,0,150000:120000:90000:60000:30000,3000:6000:9000:12000:15000,0
//-- HT_BLASTMINE //-- HT_BLASTMINE
@ -252,7 +252,7 @@
//-- AC_CHARGEARROW //-- AC_CHARGEARROW
148,1500,0,0,0,0,0 148,1500,0,0,0,0,0
//-- TF_SPRINKLESAND //-- TF_SPRINKLESAND
149,0,0,0,0,10000,0 149,0,0,0,0,30000,0
//-- TF_PICKSTONE //-- TF_PICKSTONE
151,500,0,0,0,0,0 151,500,0,0,0,0,0
@ -377,9 +377,9 @@
//-- CR_REFLECTSHIELD //-- CR_REFLECTSHIELD
252,0,0,0,300000,0,0 252,0,0,0,300000,0,0
//-- CR_HOLYCROSS //-- CR_HOLYCROSS
253,0,0,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0 253,0,0,0,0,30000,0
//-- CR_GRANDCROSS //-- CR_GRANDCROSS
254,2000,1500,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0 254,2000,1500,900,900,30000,0
//-- CR_DEVOTION //-- CR_DEVOTION
255,3000,0,0,0,30000:45000:60000:75000:90000,0 255,3000,0,0,0,30000:45000:60000:75000:90000,0
//-- CR_PROVIDENCE //-- CR_PROVIDENCE
@ -513,8 +513,10 @@
//===== NPC Skills Part 2 ================== //===== NPC Skills Part 2 ==================
//-- NPC_DARKCROSS
338,0,0,0,0,30000,0
//-- NPC_GRANDDARKNESS //-- NPC_GRANDDARKNESS
339,2000,1500,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0 339,0,0,900,900,30000,0
//-- NPC_STOP //-- NPC_STOP
342,0,0,0,10000,0,0 342,0,0,0,10000,0,0
//-- NPC_CHANGEUNDEAD //-- NPC_CHANGEUNDEAD
@ -656,7 +658,7 @@
//-- PF_SPIDERWEB //-- PF_SPIDERWEB
405,0,0,0,30000,8000,0 405,0,0,0,30000,8000,0
//-- ASC_METEORASSAULT (Upkeep2 times are duration of: blind(lv1), stun(lv2) or bleeding (lv3)) //-- ASC_METEORASSAULT (Upkeep2 times are duration of: blind(lv1), stun(lv2) or bleeding (lv3))
406,500,500,0,0,10000:5000:120000,0 406,500,500,0,0,30000:5000:120000,0
//-- ASC_CDP //-- ASC_CDP
407,0,500,0,0,0,0 407,0,500,0,0,0,0
//========================================== //==========================================
@ -892,7 +894,7 @@
//-- NJ_SUITON //-- 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 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 //-- NJ_HYOUSYOURAKU
539,2000:2500:3000:3500:4000,2000,0,100,7500:12500:17500:22500:27500,0 539,2000:2500:3000:3500:4000,2000,0,100,5000:10000:15000:20000:25000,0
//-- NJ_HUUJIN //-- NJ_HUUJIN
540,1000:1500:2000:2500:3000:3500:4000:4500:5000:5500,1000,0,0,0,0 540,1000:1500:2000:2500:3000:3500:4000:4500:5000:5500,1000,0,0,0,0
//-- NJ_RAIGEKISAI //-- NJ_RAIGEKISAI

34
db/re/skill_cast_db.txt
View File

@ -39,7 +39,7 @@
//-- MG_COLDBOLT //-- MG_COLDBOLT
14,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 14,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_FROSTDIVER //-- MG_FROSTDIVER
15,640,1500,0,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000,0,160 15,640,1500,0,0,5500:8500:11500:14500:17500:20500:23500:26500:29500:32500,0,160
//-- MG_STONECURSE //-- MG_STONECURSE
16,800,0,0,5000,20000,0,200 16,800,0,0,5000,20000,0,200
//-- MG_FIREBALL //-- MG_FIREBALL
@ -164,13 +164,13 @@
//-- WZ_JUPITEL //-- WZ_JUPITEL
84,1600:1920:2240:2560:2880:3200:3520:3840:4160:4480,0,0,0,0,0,400:480:560:640:720:800:880:960:1040:1120 84,1600:1920:2240:2560:2880:3200:3520:3840:4160:4480,0,0,0,0,0,400:480:560:640:720:800:880:960:1040:1120
//-- WZ_VERMILION //-- WZ_VERMILION
85,9600:9280:8960:8640:8320:8000:7680:7360:7040:6720,5000,0,4000,5500:6000:6500:7000:7500:8000:8500:9000:9500:10000,0,2400:2320:2240:2160:2080:2000:1920:1840:1760:1680 85,9600:9280:8960:8640:8320:8000:7680:7360:7040:6720,5000,0,4000,20000,0,2400:2320:2240:2160:2080:2000:1920:1840:1760:1680
//-- WZ_WATERBALL //-- WZ_WATERBALL
86,640:1280:1920:2560:3200,0,0,10000,0,0,160:320:480:640:800 86,640:1280:1920:2560:3200,0,0,10000,0,0,160:320:480:640:800
//-- WZ_ICEWALL //-- WZ_ICEWALL
87,0,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0,0,0 87,0,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0,0,0
//-- WZ_FROSTNOVA //-- WZ_FROSTNOVA
88,640:640:576:576:512:512:448:448:384:384,200,0,0,4000:5000:6000:8000:10000:12000:13000:15000:16000:17000,0,160:160:144:144:128:128:112:112:96:96 88,640:640:576:576:512:512:448:448:384:384,200,0,0,4000:5500:7000:8500:10000:11500:13000:14500:16000:17500,0,160:160:144:144:128:128:112:112:96:96
//-- WZ_STORMGUST //-- WZ_STORMGUST
89,3840:4480:5120:5760:6400:7040:7680:8320:8960:9600,5000,0,4600,30000,0,960:1120:1280:1440:1600:1760:1920:2080:2240:2400 89,3840:4480:5120:5760:6400:7040:7680:8320:8960:9600,5000,0,4600,30000,0,960:1120:1280:1440:1600:1760:1920:2080:2240:2400
//-- WZ_EARTHSPIKE //-- WZ_EARTHSPIKE
@ -210,9 +210,9 @@
//-- HT_SANDMAN //-- HT_SANDMAN
119,0,0,0,150000:120000:90000:60000:30000,12000:14000:16000:18000:20000,0,0 119,0,0,0,150000:120000:90000:60000:30000,12000:14000:16000:18000:20000,0,0
//-- HT_FLASHER //-- HT_FLASHER
120,0,0,0,150000:120000:90000:60000:30000,10000:11000:12000:13000:14000,0,0 120,0,0,0,150000:120000:90000:60000:30000,20000,0,0
//-- HT_FREEZINGTRAP //-- HT_FREEZINGTRAP
121,0,0,0,150000:120000:90000:60000:30000,3000:6000:9000:12000:15000,0,0 121,0,0,0,150000:120000:90000:60000:30000,5500:8500:11500:14500:17500,0,0
//-- HT_BLASTMINE //-- HT_BLASTMINE
122,0,1000,0,25000:20000:15000:10000:5000,0,0,1000 122,0,1000,0,25000:20000:15000:10000:5000,0,0,1000
//-- HT_CLAYMORETRAP //-- HT_CLAYMORETRAP
@ -251,7 +251,7 @@
148,0,0,0,0,0,0,1500 148,0,0,0,0,0,0,1500
//-- TF_SPRINKLESAND //-- TF_SPRINKLESAND
149,0,0,0,0,10000,0,0 149,0,0,0,0,20000,0,0
//-- TF_PICKSTONE //-- TF_PICKSTONE
151,0,0,0,0,0,0,500 151,0,0,0,0,0,0,500
//-- TF_THROWSTONE //-- TF_THROWSTONE
@ -294,7 +294,7 @@
//-- NPC_POISON //-- NPC_POISON
176,0,0,0,0,60000,0,0 176,0,0,0,0,60000,0,0
//-- NPC_BLINDATTACK //-- NPC_BLINDATTACK
177,0,0,0,0,30000,0,0 177,0,0,0,0,20000,0,0
//-- NPC_SILENCEATTACK //-- NPC_SILENCEATTACK
178,0,0,0,0,30000,0,0 178,0,0,0,0,30000,0,0
//-- NPC_STUNATTACK //-- NPC_STUNATTACK
@ -374,9 +374,9 @@
//-- CR_REFLECTSHIELD //-- CR_REFLECTSHIELD
252,0,0,0,300000,0,0,0 252,0,0,0,300000,0,0,0
//-- CR_HOLYCROSS //-- CR_HOLYCROSS
253,0,0,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0,0 253,0,0,0,0,20000,0,0
//-- CR_GRANDCROSS //-- CR_GRANDCROSS
254,1500,1500,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0,1500 254,1500,1500,900,900,20000,0,1500
//-- CR_DEVOTION //-- CR_DEVOTION
255,1500,0,0,0,30000:45000:60000:75000:90000,0,1500 255,1500,0,0,0,30000:45000:60000:75000:90000,0,1500
//-- CR_PROVIDENCE //-- CR_PROVIDENCE
@ -507,8 +507,10 @@
//===== NPC Skills Part 2 ================== //===== NPC Skills Part 2 ==================
//-- NPC_DARKCROSS
338,0,0,0,0,20000,0,0
//-- NPC_GRANDDARKNESS //-- NPC_GRANDDARKNESS
339,0,0,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0,0 339,0,0,900,900,20000,0,0
//-- NPC_STOP //-- NPC_STOP
342,0,0,0,10000,0,0,0 342,0,0,0,10000,0,0,0
//-- NPC_CHANGEUNDEAD //-- NPC_CHANGEUNDEAD
@ -651,7 +653,7 @@
405,0,0,0,30000,8000,0,0 405,0,0,0,30000,8000,0,0
//-- ASC_METEORASSAULT (Upkeep2 times are duration of: blind(lv1), stun(lv2) or bleeding (lv3)) //-- ASC_METEORASSAULT (Upkeep2 times are duration of: blind(lv1), stun(lv2) or bleeding (lv3))
406,250,500,0,0,10000:5000:120000,0,250 406,250,500,0,0,20000:5000:120000,0,250
//-- ASC_CDP //-- ASC_CDP
407,0,5000,0,0,0,0,0 407,0,5000,0,0,0,0,0
//========================================== //==========================================
@ -969,7 +971,7 @@
//===== New Monster Skills ================= //===== New Monster Skills =================
//-- NPC_ICEBREATH //-- NPC_ICEBREATH
655,0,0,0,0,12000,0,-1 655,0,0,0,0,30000,0,-1
//-- NPC_ACIDBREATH //-- NPC_ACIDBREATH
657,0,0,0,0,60000,0,-1 657,0,0,0,0,60000,0,-1
//-- NPC_DRAGONFEAR (Upkeep2 times are duration of: Stun(lv1), Silence(lv2), Confusion(lv3) and Bleeding(lv4)) //-- NPC_DRAGONFEAR (Upkeep2 times are duration of: Stun(lv1), Silence(lv2), Confusion(lv3) and Bleeding(lv4))
@ -981,7 +983,7 @@
//-- NPC_WIDESILENCE //-- NPC_WIDESILENCE
663,0,0,0,0,30000,0,-1 663,0,0,0,0,30000,0,-1
//-- NPC_WIDEFREEZE //-- NPC_WIDEFREEZE
664,0,0,0,0,12000,0,-1 664,0,0,0,0,30000,0,-1
//-- NPC_WIDEBLEEDING //-- NPC_WIDEBLEEDING
665,0,0,0,0,120000,0,-1 665,0,0,0,0,120000,0,-1
//-- NPC_WIDESTONE //-- NPC_WIDESTONE
@ -993,7 +995,7 @@
//-- NPC_WIDESIGHT //-- NPC_WIDESIGHT
669,0,0,0,10000,0,0,-1 669,0,0,0,10000,0,0,-1
//-- NPC_EVILLAND //-- NPC_EVILLAND
670,0,0,0,3900:4900:5900:6900:7900:8900:9900:10900:11900:12900,30000,0,-1 670,0,0,0,3900:4900:5900:6900:7900:8900:9900:10900:11900:12900,20000,0,-1
//-- NPC_MAGICMIRROR //-- NPC_MAGICMIRROR
671,0,0,0,30000:30000:30000:30000:30000:2000:2000:2000:2000:2000,0,0,-1 671,0,0,0,30000:30000:30000:30000:30000:2000:2000:2000:2000:2000,0,0,-1
//-- NPC_SLOWCAST //-- NPC_SLOWCAST
@ -1201,7 +1203,7 @@
//-- WL_FROSTMISTY //-- WL_FROSTMISTY
2203,2000:2500:3000:3500:4000,1000,0,40000,0,4000,500 2203,2000:2500:3000:3500:4000,1000,0,40000,0,4000,500
//-- WL_JACKFROST //-- WL_JACKFROST
2204,2000:2500:3000:3500:4000,1000,0,10000:15000:20000:25000:30000,0,0,1000 2204,2000:2500:3000:3500:4000,1000,0,12500:17500:22500:27500:32500,0,0,1000
//-- WL_MARSHOFABYSS //-- WL_MARSHOFABYSS
2205,2500,1000,0,30000,0,0,500 2205,2500,1000,0,30000,0,0,500
//-- WL_RECOGNIZEDSPELL //-- WL_RECOGNIZEDSPELL
@ -1865,7 +1867,7 @@
//-- MA_SANDMAN //-- MA_SANDMAN
8211,0,0,0,150000:120000:90000:60000:30000,12000:14000:16000:18000:20000,0,0 8211,0,0,0,150000:120000:90000:60000:30000,12000:14000:16000:18000:20000,0,0
//-- MA_FREEZINGTRAP //-- MA_FREEZINGTRAP
8212,0,0,0,150000:120000:90000:60000:30000,3000:6000:9000:12000:15000,0,0 8212,0,0,0,150000:120000:90000:60000:30000,5500:8500:11500:14500:17500,0,0
//-- MA_CHARGEARROW //-- MA_CHARGEARROW
8214,750,1000,0,0,0,0,750 8214,750,1000,0,0,0,0,750
//-- MA_SHARPSHOOTING //-- MA_SHARPSHOOTING

6
src/map/skill.c
View File

@ -1199,8 +1199,12 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
sc_start(src,bl,SC_BLIND,3*skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv)); sc_start(src,bl,SC_BLIND,3*skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv));
break; break;
case CR_GRANDCROSS:
case NPC_GRANDDARKNESS: case NPC_GRANDDARKNESS:
sc_start(src, bl, SC_BLIND, 100, skill_lv, skill_get_time2(skill_id, skill_lv));
attack_type |= BF_WEAPON;
break;
case CR_GRANDCROSS:
//Chance to cause blind status vs demon and undead element, but not against players //Chance to cause blind status vs demon and undead element, but not against players
if(!dstsd && (battle_check_undead(tstatus->race,tstatus->def_ele) || tstatus->race == RC_DEMON)) if(!dstsd && (battle_check_undead(tstatus->race,tstatus->def_ele) || tstatus->race == RC_DEMON))
sc_start(src,bl,SC_BLIND,100,skill_lv,skill_get_time2(skill_id,skill_lv)); sc_start(src,bl,SC_BLIND,100,skill_lv,skill_get_time2(skill_id,skill_lv));