...
 
Commits (23)
......@@ -35,6 +35,7 @@
2350,MER_SEDORA,Sedora,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
2351,MER_CHEPET,Chepet,83,9815,234,2,1100,1300,60,60,85,90,71,43,85,105,10,12,0,6,47,150,1080,780,180
2378,MER_ANTLER_SCARABA,Antler Scaraba,136,30000,1,1,1418,1828,155,102,23,99,59,129,137,45,10,12,1,4,42,200,504,624,360
2937,M_LOKI,Loki's Shadow,145,1215600,1,2,1835,2279,15,89,76,66,90,55,189,22,10,12,1,7,20,175,800,750,300
// Normal Mercenaries
6017,MER_ARCHER01,Mina,20,256,200,10,170,85,7,5,1,16,5,1,28,8,10,0,0,7,20,150,700,432,300
......
......@@ -215,3 +215,5 @@
2347,8202,5 //MS_MAGNUM
2347,8226,1 //MER_REGAIN
2347,8233,1 //MER_AUTOBERSERK
// M_LOKI
2937,8241,1 //MER_INVINCIBLEOFF2
......@@ -1489,6 +1489,7 @@
8238,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0,0x0, MER_KYRIE,Kyrie Eleison
8239,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0,0x1000, MER_BLESSING,Blessing
8240,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0,0x1000, MER_INCAGI,Increase Agility
8241,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, MER_INVINCIBLEOFF2,Mind Blaster
//****
// Elemental Spirits Skills
......
......@@ -23,7 +23,7 @@
16,Horror Toy Factory,3600,300,1@xm_d,111,22
17,Faceworm's Nest,3600,300,1@face,112,370
18,Ghost Palace,3600,300,1@spa,42,196
// 19,Devil's Tower,3600,300,1@tnm1,50,104,1@tnm2,1@tnm3
19,Devil's Tower,3600,300,1@tnm1,50,104,1@tnm2,1@tnm3
// 20,Assault on the Airship,3600,300,1@air1,244,73,1@air2
21,Fenrir and Sarah,3600,300,1@glast,367,304
// 22,Wave Mode - Forest,3600,300,1@def01,50,21
......
......@@ -1020,7 +1020,7 @@
1668,Sword_Stick,Sword Stick,5,10,,500,120:150,,,2,0x800200,63,2,2,4,80,1,10,{ bonus bAspdRate,10; },{},{}
1669,Thanos_Staff,Thanatos Staff,5,10,,1000,100:200,,1,1,0x00018314,56,2,2,4,120,1,10,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus bHealPower,15; bonus bMagicHPGainValue,500; bonus bMagicSPGainValue,50; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
1670,RWC_Memory_Staff,RWC Memory Staff,5,20,,500,25:30,,1,1,0x00818315,63,2,2,3,1,1,10,{ .@r = getrefine(); bonus bMatk,30*(.@r/3); if(.@r>=6) bonus2 bMagicAddClass,Class_All,(.@r>=9?10:5); if(.@r>=9) bonus4 bAutoSpell,"HW_MAGICPOWER",1,10,0; },{},{}
1671,Staff_Of_Evil_Slayer,Devil Won Staff,5,10,,800,30:155,,,1,0x00818315,63,2,2,3,100,1,10,{ bonus2 bAddRace,RC_Undead,10; bonus2 bAddRace,RC_Demon,10; bonus2 bMagicAddRace,RC_Undead,10; bonus2 bMagicAddRace,RC_Demon,10; .@r = getrefine(); if(.@r>=12) bonus bMatkRate,7; else if(.@r>=9) bonus bMatkRate,5; },{},{}
1671,Devil_Won_Staff,Evil Slayer Vanquisher Staff,5,10,,800,30:155,,,1,0x00818315,63,2,2,3,100,1,10,{ bonus2 bAddRace,RC_Undead,10; bonus2 bAddRace,RC_Demon,10; bonus2 bMagicAddRace,RC_Undead,10; bonus2 bMagicAddRace,RC_Demon,10; .@r = getrefine(); if(.@r>=12) bonus bMatkRate,7; else if(.@r>=9) bonus bMatkRate,5; },{},{}
1673,Half_BF_Staff4,Half BF Staff4,5,20,,0,70:125,,1,0,0x00818314,63,2,2,3,80,1,10,{ bonus bInt,3; bonus bDex,2; bonus bDelayRate,-10; bonus2 bSPLossRate,5,12000; bonus bUnbreakableWeapon; },{},{}
1674,Half_BF_Staff2,Half BF Staff2,5,20,,0,70:125,,1,0,0x00818314,63,2,2,3,80,1,10,{ bonus bInt,3; bonus bDex,3; bonus2 bMagicAddRace,RC_DemiHuman,10; bonus2 bMagicAddRace,RC_Player,10; bonus3 bAddEff,Eff_Stun,200,ATF_SKILL; bonus bUnbreakableWeapon; },{},{}
1675,Walking_Stick_,Gentleman's Staff,5,20,,500,40:125,,1,3,0x00818314,63,2,2,4,50,1,10,{ bonus bDex,1; },{},{}
......@@ -7275,7 +7275,7 @@
13090,FaceWormQueen_Leg,Faceworm Queen Leg,5,20,,500,180:120,,1,2,0x028F5EEF,63,2,2,4,100,1,1,{ bonus bInt,3; autobonus "{ bonus3 bAutoSpell,\"NPC_EARTHQUAKE\",1,200; }",8,5000,BF_NORMAL,"{ specialeffect2 EF_POTION_BERSERK; active_transform 2529,5000; }"; },{},{}
13092,RWC_Memory_Knife,RWC Memory Knife,5,1000,500,650,50,0,1,1,0x02800075,63,2,2,3,1,1,1,{ .@r = getrefine(); bonus bBaseAtk,20*(.@r/3); bonus bMatk,20*(.@r/3); if(.@r>=9){ .@i = 1; bonus4 bAutoSpell,"BS_WEAPONPERFECT",1,20,0; } if(.@r>=6){ .@rate = 5*(.@i+1); bonus2 bAddClass,Class_All,.@rate; bonus2 bMagicAddClass,Class_All,.@rate; } },{},{}
13093,Thanos_Dagger,Thanatos Dagger,5,10,,800,100:130,,1,1,0x000E5CEA,56,2,2,4,120,1,1,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
13094,Dagger_Of_Evil_Slayer,Evil Slayer Stabber Dagger,5,10,,900,120,,1,1,0x028F5EEF,63,2,2,3,100,1,1,{ bonus2 bAddRace,RC_Undead,10; .@r = getrefine(); bonus2 bAddClass,Class_All,(.@r>=12?12:(.@r>=9?5:0)); },{},{}
13094,Devil_Pierced_Dagger,Evil Slayer Stabber Dagger,5,10,,900,120,,1,1,0x3E9F7EEF,63,2,2,3,100,1,1,{ bonus2 bAddRace,RC_Undead,10; .@r = getrefine(); bonus2 bAddClass,Class_All,(.@r>=12?12:(.@r>=9?5:0)); },{},{}
13096,Half_BF_Dagger2,Half BF Dagger2,5,20,,0,120:90,,1,0,0x3E9F7EEF,63,2,2,3,80,1,1,{ bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,35; bonus2 bAddRace,RC_Player,35; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Player,10; bonus bUnbreakableWeapon; autobonus "{ bonus bDefRatioAtkClass,Class_All; }",10,3000,BF_WEAPON,"{ specialeffect2 EF_HASTEUP; }"; if(Class==Job_Ninja||Class==Job_Rogue||Class==Job_Stalker) bonus bMatkRate,45; },{},{}
13097,Ru_Blue_Dagger,Blue Dagger,5,10,,1000,160,,1,1,0x00020000,56,2,2,3,100,1,1,{ bonus bStr,5; bonus bInt,5; },{},{}
13098,Ru_Blue_Ashura,Blue Ashura,5,10,,1000,150:120,,1,1,0x02000000,7,2,2,3,100,1,1,{},{},{}
......@@ -10879,7 +10879,7 @@
21007,Heavy_Sword,Heavy Greatsword,5,20,,2500,330,,1,1,0x00004082,63,2,34,1,150,1,3,{ bonus bStr,20; },{},{}
21008,Small_Karasuma,Small Karasuma,5,20,,1000,170,,1,2,0x00004082,63,2,34,4,50,1,3,{ bonus bCritAtkRate,getrefine()*2; bonus3 bAutoSpell,"NPC_CRITICALWOUND",1,50; },{},{}
21009,Thanos_Great_Sword,Thanatos Great Sword,5,10,,1300,280:120,,1,1,0x00004082,56,2,34,4,120,1,3,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
21010,Tw_Sword_Of_Evil_Slayer,Evil Slayer Slasher Sword,5,10,,2000,225,,1,1,0x00004082,63,2,34,3,100,1,3,{ bonus2 bAddRace,RC_Demon,10; bonus2 bAddRace,RC_Undead,10; .@r = getrefine(); bonus2 bAddClass,Class_All,(.@r>=12?12:(.@r>=9?5:0)); },{},{}
21010,Tw_Sword_Of_Evil_Slayer,Evil Slayer Slaher Sword,5,10,,2000,225,,1,1,0x00004082,63,2,34,3,100,1,3,{ bonus2 bAddRace,RC_Demon,10; bonus2 bAddRace,RC_Undead,10; .@r = getrefine(); bonus2 bAddClass,Class_All,(.@r>=12?12:(.@r>=9?5:0)); },{},{}
21011,Giant_Blade,Gigantic Blade,5,10,,5000,300,,1,1,0x00004082,56,2,34,4,130,1,3,{ bonus bUnbreakableWeapon; bonus bAspdRate,-5; bonus bCritAtkRate,getrefine(); if(readparam(bStr)<=110){ bonus bAtk,-250; } },{},{}
21012,Some_Wizard_MagicSword,Some Wizard MagicSword,5,0,,2200,200:150,,1,2,0x00000080,56,2,34,4,110,1,3,{},{},{}
21013,Hetairoi_Sword,Hetairoi Sword,5,0,,2200,210,,1,2,0x00000080,56,2,34,4,110,1,3,{ bonus2 bSkillUseSP,"KN_AUTOCOUNTER",2; bonus2 bSkillUseSP,"LK_PARRYING",25; },{},{}
......@@ -11542,7 +11542,7 @@
// New Katars
//===================================================================
28000,Thanos_Katar,Thanatos Katar,5,10,,1800,220:80,,1,1,0x00001000,56,2,34,4,120,1,16,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
28001,Katar_Of_Evil_Slayer,Katar Of Evil Slayer,5,10,,1200,120,,1,1,0x00001000,63,2,34,3,100,1,16,{ bonus2 bAddRace,RC_Demon,10; bonus2 bAddRace,RC_Undead,10; .@r = getrefine(); if(.@r>=9){ bonus2 bAddClass,Class_All,5; } if(.@r>=12){ bonus2 bAddClass,Class_All,7; } },{},{}
28001,Katar_Of_Evil_Slayer,Evil Slayer Ripper Katar,5,10,,1200,120,,1,1,0x00001000,63,2,34,3,100,1,16,{ bonus2 bAddRace,RC_Demon,10; bonus2 bAddRace,RC_Undead,10; .@r = getrefine(); if(.@r>=9){ bonus2 bAddClass,Class_All,5; } if(.@r>=12){ bonus2 bAddClass,Class_All,7; } },{},{}
28002,Half_BF_Katar2,Half BF Katar2,5,20,,0,130,,1,0,0x00001000,63,2,34,3,80,1,16,{ bonus bStr,1; bonus bDex,1; bonus bLuk,1; bonus2 bAddRace,RC_DemiHuman,35; bonus2 bAddRace,RC_Player,35; bonus bCritAtkRate,10; bonus bAspdRate,3; bonus bUnbreakableWeapon; },{},{}
28005,Ru_Blue_Katar,Blue Katar,5,10,,1200,190,,1,1,0x00001000,56,2,34,3,100,1,16,{ bonus bAgi,5; bonus bStr,5; },{},{}
28006,Ru_Gold_Katar,Ru Gold Katar,5,0,,1200,190,,1,2,0x00001000,56,2,34,3,120,1,16,{ bonus bAgi,8; bonus bStr,8; },{},{}
......@@ -2094,13 +2094,13 @@
2934,T_ARCHANGELING,Arc Angeling,Arc Angeling,84,25100,1,1789,1455,1,593,100,92,81,32,48,62,99,119,105,10,12,1,8,66,0x3695,180,1072,672,480,0,0,0,0,0,0,0,7410,500,7411,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
2935,T_EVIL_CLOUD_HERMIT,Taoist Hermit,Taoist Hermit,96,8266,1,902,563,10,611,30,66,46,63,57,45,60,119,45,10,12,2,0,40,0x2085,190,480,840,432,0,0,0,0,0,0,0,6067,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
2936,E_GHOSTRING,Ghostring,Ghostring,1,10,0,0,0,1,1,2,100,99,0,0,0,0,0,0,7,12,0,3,20,0x0,300,1220,1080,648,0,0,0,0,0,0,0,535,2000,12192,2000,7225,2000,6658,4000,0,0,0,0,0,0,0,0,0,0,0,0
//2937,M_LOKI
//2938,MM_MAGIC_SEAL
//2939,MM_EVIL_SHADOW1
//2940,MM_EVIL_SHADOW2
//2941,MM_EVIL_SHADOW3
//2942,MM_EVIL_FANATICS
//2943,MM_ICE_MINE
// 2937,M_LOKI,Loki,Loki,145,1215600,1,1,1,2,1835,2279,15,89,76,66,90,55,189,22,10,12,1,7,20,0x0,175,800,750,300,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
2938,MM_MAGIC_SEAL,Magic Seal,Magic Seal,140,10000000,1,1,6999,1,156,157,80,200,16,26,30,115,79,5,10,12,2,0,20,0x0200020,300,1000,1000,1000,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
2939,MM_EVIL_SHADOW1,Evil Shadow,Evil Shadow,138,112000,1,7456,5983,1,2838,4145,30,30,88,44,88,21,95,44,10,12,2,6,47,0x2003885,200,1500,600,500,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
2940,MM_EVIL_SHADOW2,Evil Shadow,Evil Shadow,141,127650,1,8103,7738,1,2343,3414,121,36,60,103,45,35,172,15,10,12,1,6,47,0x2003885,200,1000,500,600,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
2941,MM_EVIL_SHADOW3,Evil Shadow,Evil Shadow,142,153400,1,8863,6736,1,2795,4062,89,44,120,87,66,33,106,27,10,12,2,6,47,0x2003885,200,1800,780,480,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
2942,MM_EVIL_FANATICS,Evil Fanatics,Evil Believer,151,8256000,1,1008653,988954,3,2949,4289,166,103,118,72,40,55,213,30,10,12,2,6,67,0x6283885,200,1000,500,350,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
2943,MM_ICE_MINE,Icemine,Icemine,151,10000,1,0,0,1,2000,2000,200,100,100,100,100,100,100,100,12,12,0,0,88,0xC770020,2000,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,0,0,0
//2944,J_HORNET
//2945,J_MUMMY
//2946,J_ANUBIS
......@@ -2117,7 +2117,7 @@
2957,FORGOTTEN_NAME,Forgotten Name,Forgotten Name,120,19546,1,1505,1485,2,1093,1520,111,38,121,29,51,43,100,3,10,12,1,1,49,0x3885,155,1169,1152,480,0,0,0,0,0,0,0,6672,1500,682,5000,683,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0
2958,FATAL_DAYS,Fatal Days,Fatal Days,120,24240,1,2052,2026,2,1025,1428,72,15,100,71,63,85,115,37,10,12,1,6,67,0x2003885,190,720,384,480,0,0,0,0,0,0,0,6672,1500,1050,2500,1038,2500,0,0,0,0,0,0,0,0,0,0,0,0,0,0
2959,TORTUROUS_REDEEMER,Torturous Redeemer,Torturous Redeemer,120,103342,0,10590,8378,0,1253,1753,144,28,133,69,72,55,165,44,10,12,1,7,62,0x3885,200,672,420,360,0,0,0,0,0,0,0,6672,10000,6672,10000,923,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//2960,MM_FLAMECROSS
2960,MM_FLAMECROSS,Flamecross,Flamecross,151,10000,1,0,0,1,2000,2000,200,100,100,100,100,100,100,100,12,12,0,0,88,0xC770020,2000,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,0,0,0
2961,E_TORTUROUS_REDEEMER,Torturous Redeemer,Torturous Redeemer,120,103342,1,10590,8378,1,1253,1753,144,28,133,69,72,55,165,44,10,12,1,7,62,0x3885,200,672,420,360,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
//2962,E_DEVILING
//2963,WOODIE
......
......@@ -10954,6 +10954,31 @@
2923,Owl Marquees@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,6,0x3695,,,,,
2923,Owl Marquees@NPC_SUMMONSLAVE,idle,196,2,10000,2000,60000,no,self,slavele,0,2922,,,,,,
// Devil Tower Memorial
2939,Evil Shadow@NPC_PIERCINGATT,chase,158,1,4000,0,5000,yes,target,always,0,,,,,,,
2939,Evil Shadow@NPC_CURSEATTACK,attack,181,5,3500,0,20000,yes,target,always,0,,,,,,,
2940,Evil Shadow@NPC_DARKSTRIKE,attack,340,1,3000,0,5000,yes,target,always,0,,,,,,,
2941,Evil Shadow@NPC_CRITICALSLASH,chase,170,1,3000,0,5000,yes,target,always,0,,,,,,,
2941,Evil Shadow@NPC_PETRIFYATTACK,attack,180,5,3500,0,5000,yes,target,always,0,,,,,,,
2942,Evil Fanatics@NPC_INVINCIBLE,idle,685,1,10000,0,20000,yes,self,myhpltmaxrate,100,,,,,,,42
2942,Evil Fanatics@NPC_INVINCIBLE,attack,685,1,10000,0,20000,yes,self,myhpltmaxrate,100,,,,,,,42
2942,Evil Fanatics@NPC_INVINCIBLE,attack,685,1,10000,0,20000,yes,self,myhpltmaxrate,90,,,,,,,42
2942,Evil Fanatics@NPC_INVINCIBLE,attack,685,1,10000,0,20000,yes,self,myhpltmaxrate,80,,,,,,,42
2942,Evil Fanatics@NPC_INVINCIBLE,attack,685,1,10000,0,20000,yes,self,myhpltmaxrate,70,,,,,,,42
2942,Evil Fanatics@NPC_INVINCIBLE,attack,685,1,10000,0,20000,yes,self,myhpltmaxrate,60,,,,,,,42
2942,Evil Fanatics@NPC_INVINCIBLE,attack,685,1,10000,0,20000,yes,self,myhpltmaxrate,50,,,,,,,42
2942,Evil Fanatics@NPC_INVINCIBLE,attack,685,1,10000,0,20000,yes,self,myhpltmaxrate,40,,,,,,,42
2942,Evil Fanatics@NPC_INVINCIBLE,attack,685,1,10000,0,20000,yes,self,myhpltmaxrate,30,,,,,,,42
2942,Evil Fanatics@NPC_INVINCIBLE,attack,685,1,10000,0,20000,yes,self,myhpltmaxrate,20,,,,,,,42
2942,Evil Fanatics@NPC_INVINCIBLE,attack,685,1,10000,0,20000,yes,self,myhpltmaxrate,10,,,,,,,42
// 2942,Evil Fanatics@NPC_DANCINGBLADE,attack,713,1,1000,0,15000,yes,self,always,0,,,,,,,
// 2942,Evil Fanatics@NPC_PULSESTRIKE2,attack,712,1,800,0,15000,yes,self,always,0,,,,,,,
// 2942,Evil Fanatics@NPC_DARKPIERCING,attack,715,1,2500,0,60000,yes,self,always,0,,,,,,,
2943,Icemine@NPC_INVISIBLE,idle,353,1,10000,0,300000,no,self,always,0,,,,,,,
2943,Icemine@NPC_ICEMINE,idle,709,1,10000,0,300000,no,self,always,,,,,,,,
2960,Flamecross@NPC_INVISIBLE,idle,353,1,10000,0,300000,no,self,always,0,,,,,,,
2960,Flamecross@NPC_FLAMECROSS,idle,711,1,10000,0,300000,no,self,always,,,,,,,,
// Ghost Palace Memorial
2948,Cursed Soldier@NPC_BLINDATTACK,attack,177,5,500,0,5000,no,target,always,0,,,,,,,
2948,Cursed Soldier@AC_DOUBLE,attack,46,5,500,0,5000,no,target,always,0,,,,,,,
......
......@@ -1505,6 +1505,17 @@
7563,72000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Standby for Kafragaten Challenge 1"
7564,72000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Standby for Kafragaten Challenge 2"
// Devil Tower Memorial
7568,5400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Explore the tower"
7569,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Treat the injured"
7570,0,2939,7,2940,7,2941,7,0,0,0,0,0,0,0,0,0,"Destroy the demons"
7571,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Tower Expedition"
7572,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Lucile...?"
7573,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Magic Swordman Thanatos"
7574,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Thanatos Tower"
7576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Morocc castle seal"
7577,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Space distortion"
// Episode 15.1 Verus City
7606,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Phantasmagorika Excavator Recruitment"
7607,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Eden Group Leader"
......
......@@ -1045,6 +1045,10 @@
//===== New Monster Skills (12.1) ==========
//-- NPC_VENOMFOG
706,0,0,0,3000,0,0,-1
//-- NPC_ICEMINE
709,0,0,0,10000,0,0,-1
//-- NPC_FLAMECROSS
711,0,0,0,3000,0,0,-1
//-- NPC_MAXPAIN
716,0,0,0,10000,0,0,0
......@@ -1978,6 +1982,8 @@
8239,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0,0,0
//-- MER_INCAGI
8240,1000,1000,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0,0,0
//-- MER_INVINCIBLEOFF2
8241,0,0,0,10000,0,30000,0
//==========================================
//===== Elemental Skills =======================
......
......@@ -852,9 +852,9 @@
706,0,6,4,5,0,0,10,1,no,0,0x2,0,magic,0,0x1, NPC_VENOMFOG,Venom Fog
//707,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_MILLENNIUMSHIELD,Millenium Shield 2
708,11,8,2,0,0x2,9,5,-20,yes,0,0,0,magic,2,0x400, NPC_COMET,Comet 2
//709,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_ICEMINE,Ice Mine
709,0,6,4,0,0xA0,0,10,1,no,0,0x2,0,magic,0,0x0, NPC_ICEMINE,Ice Mine
//710,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_ICEEXPLO,Ice Explosion
//711,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_FLAMECROSS,Flame Cross
711,0,6,4,0,0x80,0,5,1,no,0,0x2,0,magic,2,0x1, NPC_FLAMECROSS,Flame Cross
//712,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_PULSESTRIKE2,Pulse Strike 2
//713,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_DANCINGBLADE,Dancing Blade
//714,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_DANCINGBLADE_ATK,Dancing Blade Attack
......@@ -1492,7 +1492,7 @@
8238,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0,0x0, MER_KYRIE,Kyrie Eleison
8239,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0,0x0, MER_BLESSING,Blessing
8240,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0,0x0, MER_INCAGI,Increase Agility
//8241,2,6,2,0,0,0,1,1,no,0,0,0,none,0,0x0, MER_INVINCIBLEOFF2,Mind Blaster
8241,2,6,1,0,0x1,0,1,1,no,0,0,0,weapon,0,0x0, MER_INVINCIBLEOFF2,Mind Blaster
//****
// Elemental Spirits Skills
......
......@@ -110,6 +110,8 @@
706,0xfd, , 2, 0,1000,enemy, 0x018 //NPC_VENOMFOG
708,0x86, , 0, 9,1000,enemy, 0x018 //NPC_COMET
709,0xfe, , 0, 3,1000,enemy, 0x8018 //NPC_ICEMINE
711,0xff, , -1, 0,1000,enemy, 0x8018 //NPC_FLAMECROSS
2044,0xca, , 0, 2,1000,all, 0x018 //AB_EPICLESIS
......
This diff is collapsed.
......@@ -125,15 +125,6 @@ gl_cas02_ mapflag nomemo
1@def02 mapflag nomemo
1@def03 mapflag nomemo
// Heroes' Trails - Part 1 =======
1@gef mapflag nomemo
1@face mapflag nomemo
1@sara mapflag nomemo
1@gef_in mapflag nomemo
1@glast mapflag nomemo
dali mapflag nomemo
dali02 mapflag nomemo
// WOE:TE Maps ===================
te_prtcas01 mapflag nomemo
te_prtcas02 mapflag nomemo
......
......@@ -55,6 +55,7 @@ npc: npc/re/instances/BakonawaLake.txt
npc: npc/re/instances/BangungotHospital.txt
npc: npc/re/instances/BuwayaCave.txt
npc: npc/re/instances/CentralLaboratory.txt
npc: npc/re/instances/DevilTower.txt
npc: npc/re/instances/EclageInterior.txt
npc: npc/re/instances/FacewormsNest.txt
npc: npc/re/instances/GhostPalace.txt
......
......@@ -138,7 +138,7 @@
//Mercenary System
#define MC_SKILLBASE 8201
#define MAX_MERCSKILL 40
#define MAX_MERCSKILL 41
//Elemental System
#define MAX_ELEMENTALSKILL 42
......
......@@ -5841,6 +5841,10 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
ad.damage >>= 1;
#endif
break;
case NPC_ICEMINE:
case NPC_FLAMECROSS:
ad.damage = sstatus->rhw.atk * 20 * skill_lv;
break;
default: {
if (sstatus->matk_max > sstatus->matk_min) {
MATK_ADD(sstatus->matk_min+rnd()%(sstatus->matk_max-sstatus->matk_min));
......
......@@ -6655,6 +6655,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
case ST_PRESERVE:
case NPC_INVINCIBLE:
case NPC_INVINCIBLEOFF:
case MER_INVINCIBLEOFF2:
case RK_DEATHBOUND:
case AB_RENOVATIO:
case AB_EXPIATIO:
......@@ -11734,6 +11735,8 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
#endif
case NPC_EVILLAND:
case NPC_VENOMFOG:
case NPC_ICEMINE:
case NPC_FLAMECROSS:
case RA_ELECTRICSHOCKER:
case RA_CLUSTERBOMB:
case RA_MAGENTATRAP:
......@@ -13641,6 +13644,8 @@ int skill_unit_onplace_timer(struct skill_unit *unit, struct block_list *bl, uns
case UNT_MAGMA_ERUPTION:
case UNT_MAKIBISHI:
case UNT_VENOMFOG:
case UNT_ICEMINE:
case UNT_FLAMECROSS:
skill_attack(skill_get_type(sg->skill_id),ss,&unit->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
break;
......@@ -20394,6 +20399,15 @@ void skill_init_unit_layout (void) {
memcpy(skill_unit_layout[pos].dy,dy,sizeof(dy));
}
break;
case NPC_FLAMECROSS: {
static const int dx[] = {-2,-1, 1, 2, 0, 0, 0, 0};
static const int dy[] = { 0, 0, 0, 0,-2,-1, 1, 2};
skill_unit_layout[pos].count = 8;
memcpy(skill_unit_layout[pos].dx,dx,sizeof(dx));
memcpy(skill_unit_layout[pos].dy,dy,sizeof(dy));
}
break;
default:
ShowError("unknown unit layout at skill %d\n",i);
break;
......
......@@ -237,7 +237,7 @@ struct s_skill_db {
extern struct s_skill_db **skill_db;
#define MAX_SQUARE_LAYOUT 7 // 15*15 unit placement maximum
#define MAX_SKILL_UNIT_LAYOUT (47+MAX_SQUARE_LAYOUT) // 47 special ones + the square ones
#define MAX_SKILL_UNIT_LAYOUT (48+MAX_SQUARE_LAYOUT) // 47 special ones + the square ones
#define MAX_SKILL_UNIT_LAYOUT2 17
#define MAX_SKILL_UNIT_COUNT ((MAX_SQUARE_LAYOUT*2+1)*(MAX_SQUARE_LAYOUT*2+1))
struct s_skill_unit_layout {
......
......@@ -626,6 +626,7 @@ void initChangeTables(void)
set_sc( MER_KYRIE , SC_KYRIE , SI_KYRIE , SCB_NONE );
set_sc( MER_BLESSING , SC_BLESSING , SI_BLESSING , SCB_STR|SCB_INT|SCB_DEX );
set_sc( MER_INCAGI , SC_INCREASEAGI , SI_INCREASEAGI , SCB_AGI|SCB_SPEED );
set_sc( MER_INVINCIBLEOFF2 , SC_INVINCIBLEOFF , SI_BLANK , SCB_SPEED );
set_sc( GD_LEADERSHIP , SC_LEADERSHIP , SI_BLANK , SCB_STR );
set_sc( GD_GLORYWOUNDS , SC_GLORYWOUNDS , SI_BLANK , SCB_VIT );
......