Initial release of morse cave instance (#3173)

* Initial release of morse cave instance
* Implemented NPC_JACKFROST skill

Thanks to @laziem, @ecdarreola, @Questune09 and https://www.divine-pride.net !
This commit is contained in:
Atemo 2018-06-13 20:33:36 +02:00 committed by GitHub
parent 7653d4f93a
commit d388a7122b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 1325 additions and 14 deletions

View File

@ -863,7 +863,7 @@
717,0,6,1,0,0xD2,18,10,1,no,0,0x2,0,misc,0,0x0, NPC_MAXPAIN_ATK,Max Pain Attack
//718,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_DEATHSUMMON,Death Summon
//719,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_HELLBURNING,Hell Burning
//720,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_JACKFROST,Jack Frost 2
720,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, NPC_JACKFROST,Jack Frost 2
//721,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_WIDEWEB,Wide Web
//722,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_WIDESUCK,Wide Suck
//723,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_STORMGUST2,Storm Gust 2

View File

@ -30,7 +30,7 @@
// 23,Wave Mode - Sky,3600,300,1@def02,29,35
// 24,Nightmarish Jitterbug,3600,300,1@jtb,16,17
25,Isle of Bios,3600,300,1@dth1,17,93,1@dth2,1@dth3
// 26,Morse's Cave,3600,300,1@rev,26,181
26,Morse's Cave,3600,300,1@rev,26,181
// 27,Temple of the Demon God,3600,300,1@eom,101,16
28,Central Laboratory,3600,300,1@lab,120,30
29,Last room,3600,300,1@uns,145,35

View File

@ -2155,17 +2155,17 @@
2995,XM_TEDDY_BEAR,Abandoned Teddy Bear,Abandoned Teddy Bear,148,180000,1,6666,7332,1,1347,1924,106,44,44,166,44,44,166,44,10,12,0,6,69,0x2003295,150,512,780,504,0,0,0,0,0,0,0,7317,1900,615,150,12074,100,12734,1000,12738,100,0,0,0,0,0,0,0,0,31022,1
2996,XM_CELINE_KIMI,Celine Kimi,Celine Kimi,160,66666666,1,4444444,4033332,2,5636,8303,479,444,144,166,44,444,166,166,10,12,2,1,28,0x6283695,100,768,1056,480,444444,616,10000,617,10000,22534,10000,22534,4000,18549,4000,7642,4000,19701,100,13442,100,712,10000,0,0,0,0,0,0,0,0
2997,G_XM_CELINE_KIMI,Kimi's Phantom,Kimi's Phantom,160,66666666,1,0,0,2,6666,13332,479,444,144,166,44,444,166,166,10,12,2,1,28,0x6203695,100,768,1056,480,0,0,0,0,0,0,0,6683,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//2998,EP14_MORS_EVENT
//2999,EP14_MORS_BOSSA
//3000,EP14_MORS_BOSSB
//3001,EP14_MORS_MOB1
//3002,EP14_MORS_MOB2
//3003,EP14_MORS_MOB3
//3004,EP14_MORS_MOB4
//3005,EP14_MORS_MOB5
//3006,EP14_MORS_MOB6
//3007,EP14_MORS_DUMMY
//3008,EP14_MORS_HIDDEN
2998,EP14_MORS_EVENT,Weakened Morroc,Weakened Morroc,158,1771440,1,12390,16104,1,1872,2772,113,45,87,51,45,88,106,50,12,12,2,6,60,0x6200085,200,2612,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
2999,EP14_MORS_BOSSA,Morocc Necromancer,Morocc Necromancer,158,4000000,1,2106000,1336500,1,700,700,215,555,165,190,142,146,299,93,12,12,1,7,60,0x6280085,100,300,384,288,0,0,0,0,0,0,0,607,2000,603,200,604,200,0,0,0,0,0,0,522,200,0,0,0,0,0,0
3000,EP14_MORS_BOSSB,Morocc Necromancer,Morocc Necromancer,101,80000000,1,2310750,1465200,12,700,701,1,1,1,1,1,180,1,1,12,12,1,7,82,0x6280085,2000,2700,384,288,0,0,0,0,0,0,0,607,2000,603,200,604,200,22537,10000,22537,10000,0,0,522,200,0,0,0,0,0,0
3001,EP14_MORS_MOB1,Morroc's Ghoul,Morroc's Ghoul,158,295240,1,1239,1610,1,1872,2772,113,45,87,51,45,88,106,50,12,12,1,6,60,0x6200085,1000,2612,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
3002,EP14_MORS_MOB2,Morroc's Osiris,Morroc's Osiris,158,442860,1,1239,1610,1,1872,2772,113,45,87,51,45,88,106,50,12,12,1,6,60,0x6200085,200,2612,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
3003,EP14_MORS_MOB3,Morroc's Archer Skeleton,Morroc's Archer Skeleton,158,295240,1,1239,1610,7,1872,2772,113,45,87,51,45,88,106,50,12,12,1,6,60,0x6200085,200,300,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
3004,EP14_MORS_MOB4,Morroc's Wraith,Morroc's Wraith,158,100000,1,1239,1610,1,90,180,13,45,87,51,45,88,106,50,12,12,2,6,60,0x6200085,600,300,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
3005,EP14_MORS_MOB5,Morroc's Verit,Morroc's Verit,158,442860,1,1239,1610,1,1872,2772,113,45,87,51,45,88,106,50,12,12,1,6,60,0x6200085,100,76,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
3006,EP14_MORS_MOB6,Morroc's Lude,Morroc's Lude,158,885720,1,1239,1610,3,113,226,113,45,87,51,45,88,299,50,12,12,0,6,60,0x6200085,100,76,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
3007,EP14_MORS_DUMMY,Death Soul,Death Soul,158,99999999,1,0,0,1,1872,2772,113,45,87,51,45,88,106,50,12,12,0,6,60,0x6370000,195,76,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
3008,EP14_MORS_HIDDEN,Morroc Hidden,Morroc Hidden,158,295240,1,0,0,1,1,2,113,45,1,51,45,255,106,50,12,12,0,6,60,0x620008C,2000,2000,824,440,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//3009,EP14_3_DEATH_BOSS
3010,EP14_3_DEATH_A_MOB1,Corrupt Orc Baby,Corrupt Orc Baby,158,250000,1,12390,16104,1,1036,1415,240,50,120,85,80,60,88,50,10,12,0,7,42,0x0000085,150,864,400,150,0,0,0,0,0,0,0,607,10,603,20,604,20,715,20,717,20,716,20,522,20,0,0,0,0,0,0
3011,EP14_3_DEATH_A_MOB2,Corrupt Baby Desert Wol,Corrupt Baby Desert Wol,158,232890,1,12390,16104,1,1016,1395,240,45,100,85,100,88,120,50,10,12,0,2,43,0x0000085,150,864,400,150,0,0,0,0,0,0,0,607,10,603,20,604,20,715,20,717,20,716,20,522,20,0,0,0,0,0,0

View File

@ -11077,6 +11077,80 @@
2997,Kimi's Phantom@NPC_MAXPAIN,attack,716,3,10000,3000,50000,no,self,myhpltmaxrate,10,,,,,,,
2997,Kimi's Phantom@NPC_POWERUP,attack,349,1,10000,0,50000,no,self,myhpltmaxrate,5,,,,,,6,
// Episode 14.3: Morse cave
2999,Morocc Necromancer@MG_SIGHT,idle,10,1,2000,0,5000,no,self,always,0,,,,,,,
2999,Morocc Necromancer@MG_SIGHT,idle,10,1,10000,0,5000,no,self,skillused,137,,,,,,,
2999,Morocc Necromancer@AL_TELEPORT,idle,26,1,10000,0,0,no,self,rudeattacked,,,,,,,,
2999,Morocc Necromancer@AL_TELEPORT,walk,26,1,5000,0,5000,no,self,rudeattacked,,,,,,,,
2999,Morocc Necromancer@MG_FROSTDIVER,idle,15,40,10000,1000,10000,yes,randomtarget,always,0,,,,,,,
2999,Morocc Necromancer@WZ_JUPITEL,idle,84,28,10000,1000,10000,yes,randomtarget,always,0,,,,,,,
2999,Morocc Necromancer@MG_FIREBALL,idle,17,44,10000,500,10000,yes,randomtarget,always,0,,,,,,,
2999,Morocc Necromancer@MG_FROSTDIVER,chase,15,40,10000,1000,10000,yes,target,skillused,18,,,,,,,
2999,Morocc Necromancer@WZ_JUPITEL,chase,84,28,10000,1000,10000,yes,target,skillused,18,,,,,,,
2999,Morocc Necromancer@MG_FIREBALL,chase,17,44,10000,500,10000,yes,target,skillused,18,,,,,,,
2999,Morocc Necromancer@MG_FROSTDIVER,attack,15,40,3000,1000,10000,yes,target,always,0,,,,,,,
2999,Morocc Necromancer@MG_FROSTDIVER,chase,15,40,3000,1000,10000,yes,target,always,0,,,,,,,
2999,Morocc Necromancer@HW_GANBANTEIN,attack,483,1,10000,500,7000,yes,target,always,0,,,,,,,
2999,Morocc Necromancer@HW_NAPALMVULCAN,chase,400,5,2000,1000,2000,yes,target,always,0,,,,,,,
2999,Morocc Necromancer@WZ_JUPITEL,attack,84,28,3000,1000,10000,yes,target,always,0,,,,,,,
2999,Morocc Necromancer@WZ_JUPITEL,chase,84,28,3000,1000,10000,yes,target,always,0,,,,,,,
2999,Morocc Necromancer@MG_THUNDERSTORM,attack,21,20,3000,1000,10000,yes,target,always,0,,,,,,,
2999,Morocc Necromancer@MG_THUNDERSTORM,chase,21,20,3000,1000,10000,yes,target,always,0,,,,,,,
2999,Morocc Necromancer@MG_COLDBOLT,attack,14,10,3000,1000,10000,yes,target,always,0,,,,,,,
2999,Morocc Necromancer@MG_COLDBOLT,chase,14,10,3000,1000,10000,yes,target,always,0,,,,,,,
2999,Morocc Necromancer@MG_FIREBALL,attack,17,44,3000,500,10000,yes,target,always,0,,,,,,,
2999,Morocc Necromancer@MG_FIREBALL,chase,17,44,3000,500,10000,yes,target,always,0,,,,,,,
2999,Morocc Necromancer@WZ_SIGHTRASHER,attack,81,10,3000,0,10000,no,self,always,0,,,,,,,
2999,Morocc Necromancer@WZ_QUAGMIRE,chase,92,5,3000,0,10000,no,target,always,0,,,,,,,
2999,Morocc Necromancer@MG_SAFETYWALL,attack,12,10,3000,0,10000,no,self,always,0,,,,,,,
2999,Morocc Necromancer@MG_FIREBOLT,chase,19,10,3000,1000,10000,yes,target,always,0,,,,,,,
2999,Morocc Necromancer@MG_FIREBOLT,attack,19,10,3000,1000,10000,yes,target,always,0,,,,,,,
2999,Morocc Necromancer@MG_FIREWALL,chase,18,10,3000,1000,10000,yes,target,always,0,,,,,,,
2999,Morocc Necromancer@MG_FIREWALL,attack,18,10,3000,1000,10000,yes,target,always,0,,,,,,,
2999,Morocc Necromancer@MG_LIGHTNINGBOLT,chase,20,10,3000,1000,10000,yes,target,always,0,,,,,,,
2999,Morocc Necromancer@MG_LIGHTNINGBOLT,attack,20,10,3000,1000,10000,yes,target,always,0,,,,,,,
2999,Morocc Necromancer@WZ_FROSTNOVA,chase,88,10,3000,1000,10000,yes,self,always,0,,,,,,,
2999,Morocc Necromancer@WZ_FROSTNOVA,attack,88,10,3000,1000,10000,yes,self,always,0,,,,,,,
2999,Morocc Necromancer@WZ_EARTHSPIKE,chase,90,5,3000,0,10000,no,target,always,0,,,,,,,
2999,Morocc Necromancer@WZ_EARTHSPIKE,attack,90,5,3000,0,10000,no,target,always,0,,,,,,,
2999,Morocc Necromancer@WZ_HEAVENDRIVE,chase,91,5,3000,0,10000,no,target,always,0,,,,,,,
2999,Morocc Necromancer@WZ_HEAVENDRIVE,attack,91,5,3000,0,10000,no,target,always,0,,,,,,,
3000,Morocc Necromancer@NPC_CRITICALWOUND,attack,673,2,500,0,5000,no,target,always,0,,,,,,,
3000,Morocc Necromancer@WZ_METEOR,idle,83,11,5000,0,5000,no,randomtarget,always,0,,,,,,9,
3000,Morocc Necromancer@NPC_JACKFROST,idle,720,5,3000,0,5000,no,self,always,0,,,,,,9,
3000,Morocc Necromancer@WZ_METEOR,attack,83,11,5000,0,5000,no,target,always,0,,,,,,9,
3000,Morocc Necromancer@NPC_JACKFROST,attack,720,5,3000,0,5000,no,self,always,0,,,,,,9,
3000,Morocc Necromancer@WZ_FIREPILLAR,idle,80,7,2000,0,5000,no,around2,always,0,,,,,,,
3000,Morocc Necromancer@WZ_FIREPILLAR,attack,80,7,2000,0,5000,no,around2,always,0,,,,,,,
3000,Morocc Necromancer@WZ_METEOR,idle,83,11,10000,0,10000,no,randomtarget,skillused,18,,,,,,9,
3000,Morocc Necromancer@WZ_METEOR,idle,83,11,10000,0,10000,no,randomtarget,skillused,89,,,,,,9,
3000,Morocc Necromancer@WZ_METEOR,idle,83,11,10000,0,10000,no,randomtarget,skillused,21,,,,,,9,
3000,Morocc Necromancer@WZ_METEOR,idle,83,11,10000,0,10000,no,randomtarget,skillused,28,,,,,,9,
3000,Morocc Necromancer@WZ_METEOR,idle,83,11,10000,0,10000,no,randomtarget,skillused,79,,,,,,9,
3000,Morocc Necromancer@WZ_METEOR,idle,83,11,10000,0,10000,no,randomtarget,skillused,83,,,,,,9,
3000,Morocc Necromancer@WZ_METEOR,idle,83,11,10000,0,10000,no,target,longrangeattacked,,,,,,,9,
3000,Morocc Necromancer@WZ_METEOR,idle,83,11,10000,0,10000,no,target,casttargeted,,,,,,,9,
3000,Morocc Necromancer@NPC_JACKFROST,idle,720,5,10000,0,10000,no,self,skillused,18,,,,,,9,
3000,Morocc Necromancer@NPC_JACKFROST,idle,720,5,10000,0,10000,no,self,skillused,89,,,,,,9,
3000,Morocc Necromancer@NPC_JACKFROST,idle,720,5,10000,0,10000,no,self,skillused,21,,,,,,9,
3000,Morocc Necromancer@NPC_JACKFROST,idle,720,5,10000,0,10000,no,self,skillused,28,,,,,,9,
3000,Morocc Necromancer@NPC_JACKFROST,idle,720,5,10000,0,10000,no,self,skillused,79,,,,,,9,
3000,Morocc Necromancer@NPC_JACKFROST,idle,720,5,10000,0,10000,no,self,skillused,83,,,,,,9,
3000,Morocc Necromancer@NPC_JACKFROST,idle,720,5,10000,0,10000,no,self,longrangeattacked,,,,,,,9,
3000,Morocc Necromancer@NPC_JACKFROST,idle,720,5,10000,0,10000,no,self,casttargeted,,,,,,,9,
3004,Morroc's Wraith@NPC_SELFDESTRUCTION,attack,173,1,10000,1700,0,yes,self,always,0,,,,,,,
3006,Morroc's Lude@NPC_POISON,attack,176,5,2000,0,0,yes,target,always,0,,,,,,,
3006,Morroc's Lude@NPC_BLINDATTACK,attack,177,5,2000,0,0,yes,target,always,0,,,,,,,
3006,Morroc's Lude@NPC_SILENCEATTACK,attack,178,5,5000,0,0,yes,target,always,0,,,,,,,
3006,Morroc's Lude@NPC_STUNATTACK,attack,179,5,5000,0,0,yes,target,always,0,,,,,,,
3006,Morroc's Lude@NPC_PETRIFYATTACK,attack,180,5,2000,0,0,yes,target,always,0,,,,,,,
3006,Morroc's Lude@NPC_CURSEATTACK,attack,181,5,5000,0,0,yes,target,always,0,,,,,,,
3006,Morroc's Lude@NPC_SLEEPATTACK,attack,182,5,2000,0,0,yes,target,always,0,,,,,,,
3006,Morroc's Lude@NPC_HALLUCINATION,attack,207,5,2000,0,0,yes,target,always,0,,,,,,,
3006,Morroc's Lude@NPC_BLEEDING,attack,660,5,2000,0,0,yes,target,always,0,,,,,,,
3008,Morroc Hidden@AL_HEAL,attack,28,9,10000,500,5000,no,friend,friendhpltmaxrate,60,,,,,,,
3008,Morroc Hidden@AL_HEAL,idle,28,9,10000,500,5000,no,friend,friendhpltmaxrate,60,,,,,,,
3026,Fire Pit@NPC_DEATHSUMMON,dead,718,3,10000,0,10000,no,self,always,0,3027,3027,3027,,,,
// Episode 14.3: Isle of Bios

View File

@ -1983,6 +1983,10 @@
9315,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9316,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
// EP14.3 Morse's Cave
9318,0,3000,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Pursuing Hiding Morroc"
9319,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Pursuing Hiding Morroc Continues"
//9327,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
//9328,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""
//9329,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""

View File

@ -1047,6 +1047,8 @@
706,0,0,0,3000,0,0,-1
//-- NPC_MAXPAIN
716,0,0,0,10000,0,0,0
//-- NPC_JACKFROST
720,0,0,0,12500:17500:22500:27500:32500,0,0,-1
//===== 2nd Jobs Quest Skills ==============
//-- KN_CHARGEATK

View File

@ -863,7 +863,7 @@
717,0,6,1,0,0xD2,18,10,1,no,0,0x2,0,misc,0,0x0, NPC_MAXPAIN_ATK,Max Pain Attack
718,0,0,4,0,0x1,0,10,1,no,0,0x2,0,magic,0,0x0, NPC_DEATHSUMMON,Death Summon
//719,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_HELLBURNING,Hell Burning
//720,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_JACKFROST,Jack Frost 2
720,0,8,4,1,0x2,5:6:7:8:9,5,-5,no,0,0,0,magic,0,0x0, NPC_JACKFROST,Jack Frost 2
//721,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_WIDEWEB,Wide Web
//722,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_WIDESUCK,Wide Suck
//723,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_STORMGUST2,Storm Gust 2

File diff suppressed because it is too large Load Diff

View File

@ -64,6 +64,7 @@ npc: npc/re/instances/HorrorToyFactory.txt
npc: npc/re/instances/IsleOfBios.txt
npc: npc/re/instances/LastRoom.txt
npc: npc/re/instances/MalangdoCulvert.txt
npc: npc/re/instances/MorseCave.txt
npc: npc/re/instances/OctopusCave.txt
npc: npc/re/instances/OldGlastHeim.txt
npc: npc/re/instances/SarahAndFenrir.txt

View File

@ -6004,6 +6004,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
RE_LVL_DMOD(100);
break;
case WL_JACKFROST:
case NPC_JACKFROST:
if (tsc && tsc->data[SC_FREEZING]) {
skillratio += 900 + 300 * skill_lv;
RE_LVL_DMOD(100);

View File

@ -1564,6 +1564,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
}
break;
case WL_JACKFROST:
case NPC_JACKFROST:
sc_start(src,bl,SC_FREEZE,200,skill_lv,skill_get_time(skill_id,skill_lv));
break;
case RA_WUGBITE: {
@ -4909,6 +4910,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
case NPC_HELLJUDGEMENT:
case NPC_VAMPIRE_GIFT:
case NPC_MAXPAIN_ATK:
case NPC_JACKFROST:
case RK_IGNITIONBREAK:
case AB_JUDEX:
case WL_SOULEXPANSION:
@ -9488,6 +9490,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
break;
case WL_JACKFROST:
case NPC_JACKFROST:
clif_skill_nodamage(src,bl,skill_id,skill_lv,1);
map_foreachinrange(skill_area_sub,bl,skill_get_splash(skill_id,skill_lv),BL_CHAR|BL_SKILL,src,skill_id,skill_lv,tick,flag|BCT_ENEMY|1,skill_castend_damage_id);
break;

View File

@ -551,6 +551,7 @@ void initChangeTables(void)
set_sc( NPC_INVINCIBLEOFF , SC_INVINCIBLEOFF , EFST_BLANK , SCB_SPEED );
set_sc( NPC_COMET , SC_BURNING , EFST_BURNT , SCB_MDEF );
set_sc_with_vfx( NPC_MAXPAIN , SC_MAXPAIN , EFST_MAXPAIN , SCB_NONE );
add_sc( NPC_JACKFROST , SC_FREEZE );
set_sc( CASH_BLESSING , SC_BLESSING , EFST_BLESSING , SCB_STR|SCB_INT|SCB_DEX );
set_sc( CASH_INCAGI , SC_INCREASEAGI , EFST_INC_AGI, SCB_AGI|SCB_SPEED );