diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt index d09198665a..0ba147e990 100644 --- a/db/re/item_combo_db.txt +++ b/db/re/item_combo_db.txt @@ -349,10 +349,10 @@ 4545:18730,{ bonus bMatk,5; bonus bBaseAtk,5; } 4605:4606,{ bonus2 bSubEle,Ele_Neutral,20; bonus bFlee,20; bonus2 bHPLossRate,100,6000; bonus2 bSPLossRate,6,6000; } 4608:4609,{ bonus2 bAddSize,Size_Medium,15; bonus2 bAddSize,Size_Large,15; bonus2 bSubSize,Size_Medium,5; bonus2 bSubSize,Size_Large,5; } -4626:4628,{ bonus2 bSubRace,RC_Formless,5; bonus2 bSubRace,RC_Demon,5; bonus2 bIgnoreMdefRaceRate,RC_Formless,50; bonus2 bIgnoreMdefRaceRate,RC_Demon,50; } -4627:4628,{ bonus2 bSubRace,RC_Formless,5; bonus2 bSubRace,RC_Demon,5; bonus2 bIgnoreDefRaceRate,RC_Formless,50; bonus2 bIgnoreDefRaceRate,RC_Demon,50;} -4629:4630,{ bonus3 bAutoSpell,677,2,2; bonus2 bSubEle,Ele_Neutral,5; } -4631:4632,{ bonus5 bAutoSpell,85,1,1,BF_SHORT,0; } +4626:4628,{ bonus2 bIgnoreMdefRaceRate,RC_Demon,50; } +4627:4628,{ bonus2 bIgnoreDefRaceRate,RC_Formless,50; bonus2 bIgnoreDefRaceRate,RC_Demon,50;} +4629:4630,{ bonus3 bAutoSpell,"NPC_WIDECURSE",2,2; bonus2 bSubEle,Ele_Neutral,5; } +4631:4632,{ bonus5 bAutoSpell,"WZ_VERMILION",1,1,BF_WEAPON,0; } 4635:4636,{ bonus2 bResEff,Eff_Burning,10000; } 4642:4646,{ bonus bAtkRate,10; bonus bMatkRate,10; } 4643:4646,{ bonus bAtkRate,10; bonus bMatkRate,10; } diff --git a/db/re/item_db.txt b/db/re/item_db.txt index c4305a4570..aac302b3b2 100644 --- a/db/re/item_db.txt +++ b/db/re/item_db.txt @@ -2155,7 +2155,7 @@ 2967,RWC_2012_Ring_,Chambered RWC 2012 Ring,4,20,,200,,0,,1,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus2 bAddClass,Class_All,1; },{},{} 2968,RWC_2012_Pendant,RWC 2012 Pendant,4,20,,200,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bMatkRate,1; },{},{} 2969,RWC_2012_Pendant_,Chambered RWC 2012 Pendant,4,20,,200,,0,,1,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bMatkRate,1; },{},{} -2971,Pocket_Watch,Pocket Watch,4,10,,200,,1,,1,0x800200,63,2,136,,80,1,,{},{},{} +2971,Pocket_Watch,Pocket Watch,4,10,,200,,1,,1,0x800200,63,2,136,,80,1,,{ bonus bHPrecovRate,15; bonus bSPrecovRate,15; bonus bMatkRate,7; },{},{} 2976,Red_Lantern,Red Lantern,4,10,,200,,0,,1,0xFFFFFFFF,63,2,136,,100,0,,{ bonus bMaxSP,-300; skill "MG_SIGHT",1; },{},{ sc_end SC_SIGHT; } 2977,Broken_Heart,Broken Heart,4,10,,100,,0,,1,0xFFFFFFFF,63,2,136,,110,0,,{ bonus bMaxSP,200; skill "DC_SCREAM",3; },{},{} 2978,Kindly_Heart,Kindly Heart,4,10,,100,,0,,1,0xFFFFFFFF,63,2,136,,110,0,,{ bonus bMaxHP,500; bonus2 bHPRegenRate,300,10000; skill "DC_SCREAM",3; },{},{} @@ -2789,13 +2789,13 @@ 4609,Khalitzburg_Knight_Card,Khalitzburg Knight Card,6,20,,10,,,,,,,,32,,,,,{ bonus bDef,20; bonus2 bSubSize,Size_Medium,25; bonus2 bSubSize,Size_Large,25; },{},{} 4610,Sarah_Card,Sarah Card,6,10,,10,,,,,,,,16,,,,,{ bonus bAbsorbDmgMaxHP,100; },{},{} 4625,Time_Holder_Card,Time Holder Card,6,10,,10,,,,,,,,2,,,,,{ bonus bMatkRate,20; bonus bUseSPrate,10; },{},{} -4626,Big_Ben_Card,Big Ben Card,6,10,,10,,,,,,,,2,,,,,{ bonus2 bMagicAddRace,RC_Formless,10; bonus2 bMagicAddRace,RC_Demon,10; },{},{} +4626,Big_Ben_Card,Big Ben Card,6,10,,10,,,,,,,,2,,,,,{ bonus2 bMagicAddRace,RC_Formless,5; bonus2 bMagicAddRace,RC_Demon,5; },{},{} 4627,Big_Bell_Card,Big Bell Card,6,10,,10,,,,,,,,2,,,,,{ bonus2 bAddRace,RC_Formless,10; bonus2 bAddRace,RC_Demon,10; },{},{} 4628,Neo_Punk_Card,Neo Punk Card,6,10,,10,,,,,0xFFFFFFFF,63,2,32,,,,,{ bonus2 bSubRace,RC_Formless,20; bonus2 bSubRace,RC_Demon,20; },{},{} -4629,Arc_Elder_Card,Arc Elder Card,6,10,,10,,,,,,,,4,,,,,{ bonus2 bSubEle,Ele_Neutral,15; bonus2 bMagicAtkEle,Ele_Earth,30; },{},{} -4630,Nightmare_Timer_Keeper_Card,Nightmare Timer Keeper Card,6,10,,10,,,,,,,,64,,,,,{ bonus3 bAutoSpell,"NPC_WIDECURSE",2,1; },{},{} +4629,Arc_Elder_Card,Arc Elder Card,6,10,,10,,,,,,,,4,,,,,{ bonus2 bSubEle,Ele_Neutral,15; bonus2 bMagicAtkEle,Ele_Earth,getrefine()*3; },{},{} +4630,Nightmare_Timer_Keeper_Card,Nightmare Timer Keeper Card,6,10,,10,,,,,,,,64,,,,,{ bonus3 bAutoSpell,"NPC_WIDECURSE",2,20; },{},{} 4631,Owl_Viscount_Card,Owl Viscount Card,6,10,,10,,,,,,,,136,,,,,{ bonus bAspdRate,3; },{},{} -4632,Owl_Marquees_Card,Owl Marquees Card,6,10,,10,,,,,,,,136,,,,,{ bonus5 bAutoSpell,"SA_VIOLENTGALE",(getskilllv("SA_VIOLENTGALE")==5?5:1),1,BF_SHORT,0; },{},{} +4632,Owl_Marquees_Card,Owl Marquees Card,6,10,,10,,,,,,,,136,,,,,{ bonus5 bAutoSpell,"SA_VIOLENTGALE",(getskilllv("SA_VIOLENTGALE")==5?5:1),1,BF_WEAPON,0; },{},{} 4633,Enhanced_Archer_Skeleton_Card,Enhanced Archer Skeleton Card,6,20,,10,,,,,,,,2,,,,,{ bonus bLongAtkRate,(BaseLevel>=100?12:10); },{},{} 4634,Enhanced_Soldier_Skeleton_Card,Enhanced Soldier Skeleton Card,6,20,,10,,,,,,,,2,,,,,{ if (BaseLevel<100) { bonus bCritical,9; } else { bonus bCritical,10; bonus bCritAtkRate,5; } },{},{} 4635,Enhanced_Amdarais_Card,Enhanced Amdarais Card,6,20,,10,,,,,,,,16,,,,,{ .@r = getrefine(); bonus bDef,(.@r*10); bonus bFlee,(.@r*-2); if (BaseLevel>=100) bonus bMaxHP,500; },{},{} @@ -5778,9 +5778,9 @@ 7935,Poison_Herb_Seratum,Poison Herb Seratum,3,1,,10,,,,,,,,,,,,,{},{},{} 7936,Poison_Herb_Scopolia,Poison Herb Scoporia,3,1,,10,,,,,,,,,,,,,{},{},{} 7937,Poison_Herb_Amoena,Poison Herb Amoena,3,1,,10,,,,,,,,,,,,,{},{},{} -7938,Light_Granule,Light Granule,3,1000,,10,,,,,,,,,,,,,{},{},{} -7939,Elder_Branch,Elder Branch,3,1000,,10,,,,,,,,,,,,,{},{},{} -7940,Special_Alloy_Trap,Special Alloy Trap,3,200,,2,,,,,,,,,,,,,{},{},{} +7938,Light_Granule,Light Granule,3,1500,,10,,,,,,,,,,,,,{},{},{} +7939,Elder_Branch,Elder Branch,3,1500,,10,,,,,,,,,,,,,{},{},{} +7940,Special_Alloy_Trap,Special Alloy Trap,3,300,,2,,,,,,,,,,,,,{},{},{} 7941,Halloween_Ticket,Halloween Ticket,3,10,,0,,,,,,,,,,,,,{},{},{} 7942,Letter_From_Chico,Chico Cesar Letter,3,0,,0,,,,,,,,,,,,,{},{},{} 7943,Caskinya,Caskinya,3,0,,0,,,,,,,,,,,,,{},{},{} @@ -9663,7 +9663,7 @@ 18748,Gold_Ingot_Poring_Hat,Gold Ingot Poring Hat,4,20,,200,,3,,1,0xFFFFFFFF,63,2,256,,0,1,887,{ bonus bDex,2; bonus bLuk,2; },{},{} 18749,Majoruros_Horn,Majoruros Horn,4,20,,500,,8,,1,0xFFFFFFFF,63,2,256,,0,1,888,{ bonus bStr,2; bonus bMaxHP,100; },{},{} 18750,Poker_Card_In_Mouth,Poker Card In Mouth,4,20,,50,,0,,0,0xFFFFFFFF,63,2,1,,10,0,889,{ bonus2 bAddRace,RC_DemiHuman,2; },{},{} -18752,Rideword_Hat_,Rideword Hat,4,20,,300,,3,,1,0xFFFFFFFE,63,2,256,,99,1,890,{ .@r = getrefine(); bonus2 bHPLossRate,500*.@r,5000; bonus2 bHPDrainRate,40,4+(.@r/2); bonus2 bSPDrainRate,10,1+(.@r/3); },{},{} +18752,Cursed_Book,Cursed Book,4,20,,300,,3,,1,0xFFFFFFFE,63,2,256,,99,1,890,{ .@r = getrefine(); bonus2 bHPLossRate,.@r,5000; bonus2 bHPDrainRate,40,4+(.@r/2); bonus2 bSPDrainRate,10,1+(.@r/3); },{},{} 18753,Tw_Rice_Ball,Tw Rice Ball,4,20,,100,,6,,0,0xFFFFFFFF,63,2,256,,0,0,892,{ bonus bLuk,1; bonus2 bAddMonsterDropItem,564,100; },{},{} 18754,Blood_Sucker,Blood Sucker,4,20,,300,,0,,0,0xFFFFFFFF,63,2,1,,40,0,893,{ bonus bUnbreakableHelm,1; bonus2 bHPDrainRate,30,5; bonus bHPrecovRate,-100; bonus bSPrecovRate,-100; },{},{} 18755,Feather_Beret_,Feather Beret,4,0,,600,,1,,1,0xFFFFFFFF,63,2,256,1,1,1,224,{ bonus bMdef,1; bonus2 bSubRace,RC_DemiHuman,10; bonus2 bSubRace,RC_Player,10; },{},{} @@ -9752,7 +9752,7 @@ 18871,Very_Sweet_Candy,Very Sweet Candy,4,10,,10,,,,0,0xFFFFFFFF,63,2,1,,1,1,446,{ bonus bAllStats,1; bonus bBaseAtk,5; bonus bMatk,5; },{},{} 18872,Snake_Hat,Snake Hat,4,20,,100,,5,,1,0xFFFFFFFF,63,2,256,,0,1,986,{ bonus bStr,3; bonus bInt,3; bonus bMdef,5; bonus bUnbreakableHelm,1; },{},{} 18873,Sweet_Valentine_Out,Sweet Valentine Out,4,20,,100,,1,,0,0xFFFFFFFF,63,2,256,,1,1,865,{ bonus bMaxHPrate,7; bonus bMaxSPrate,7; },{},{} -18874,Cyclops_Glasses,Cyclops Glasses,4,10,,100,,,,1,0xFFFFFFFF,63,2,512,,1,1,23,{},{},{} +18874,Cyclops_Glasses,Cyclops Glasses,4,10,,100,,,,1,0xFFFFFFFF,63,2,512,,1,,23,{},{},{} 18878,Palace_Guard_Cap,Palace Guard Cap,4,10,,1000,,15,,1,0xFFFFFFFF,63,2,256,,50,1,991,{ .@r = getrefine(); bonus2 bAddEle,Ele_Neutral,4+.@r/6; bonus bLongAtkRate,4+.@r; bonus bUnbreakableHelm,1; },{},{} 18879,Angry_Scorpion_Hat,Angry Scorpion Hat,4,10,,100,,5,,0,0xFFFFFFFF,63,2,256,,0,1,995,{ bonus bMdef,5; },{},{} 18880,Advanced_Jao_King_Hat,Advanced Jao King Hat,4,10,,1500,,4,,1,0xFFFFFFFF,63,2,256,,175,1,996,{ bonus bAllStats,3; bonus bMaxHPrate,5; bonus bMaxSPrate,5; },{},{} diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt index 0026669ea7..f215740a40 100644 --- a/db/re/mob_db.txt +++ b/db/re/mob_db.txt @@ -1632,8 +1632,8 @@ 2476,MG_AMDARAIS,Amdarias,Amdarias,143,3283990,1,74288,77950,2,8860,10022,32,66,140,159,30,109,300,90,10,12,2,2,63,0x6283695,200,1152,1152,576,37144,617,5500,617,5000,616,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4601,1 //2477,NG_WANDER_MAN -//2478,NG_RIDEWORD -//2479,NG_MIMIC +2478,NG_RIDEWORD,Nightmare Rideword,Nightmare Rideword,146,103220,1,10500,15840,1,2320,166,140,59,131,195,58,66,263,5,12,12,0,0,60,0x3695,150,864,500,192,0,0,0,0,0,0,0,1097,4850,1568,5,1569,5,1570,5,1571,5,7015,150,18752,1,0,0,0,0,0,0 +2479,NG_MIMIC,Nightmare Mimic,Nightmare Mimic,143,24958,1,2768,2354,1,1787,159,139,46,145,162,10,49,213,57,10,12,1,0,60,0x3095,100,972,500,288,0,0,0,0,0,0,0,617,10,603,50,7940,1000,7938,1000,2626,10,757,270,0,0,0,0,0,0,0,0 //2480,NG_EVIL_DRUID //2481,NG_WRAITH_DEAD //2482,G_MG_KHALITZBURG @@ -2070,14 +2070,14 @@ 2913,C3_ACIDUS_,Acidus Ringleader,Acidus Ringleader,130,203590,203590,14690,30480,2,1660,2372,98,47,106,110,61,53,133,53,10,12,2,9,44,0x3095,180,168,768,360,0,0,0,0,0,0,0,505,150,1035,4000,2890,10,1036,3589,7446,800,996,20,7446,100,0,0,0,0,4379,1 //2914,E_GEFFEN_MAGE_3_1 //2915,HIDDEN_MOB6 -//2916,BIG_BEN -//2917,BIG_BELL -//2918,TIME_KEEPER -//2919,NEO_PUNK -//2920,ARC_ELDER -//2921,OWL_VISCOUNT -//2922,G_OWL_VISCOUNT -//2923,OWL_MARQUEES +2916,BIG_BEN,Big Ben,Big Ben,150,220240,1,7447,7005,1,3101,212,125,43,102,58,69,75,131,49,10,12,1,0,42,0x91,200,1092,792,480,0,0,0,0,0,0,0,1095,3000,1019,500,509,950,568,160,757,100,22515,15,22515,15,0,0,0,0,4626,1 +2917,BIG_BELL,Big Bell,Big Bell,163,166860,1,7513,8457,1,4785,192,138,53,102,104,72,57,98,57,10,12,1,0,60,0x3695,300,1020,500,768,0,0,0,0,0,0,0,1095,3000,2607,1,7005,750,984,100,912,750,22515,10,0,0,0,0,0,0,4627,1 +2918,TIME_KEEPER,Time Keeper,Time Keeper,155,256000,1,7898,8869,3,2989,280,128,60,112,60,72,57,120,77,10,12,2,0,80,0x91,200,1072,672,384,0,0,0,0,0,0,0,1095,3000,7054,3000,999,250,520,425,2109,1,22515,1000,22515,1000,0,0,0,0,4630,1 +2919,NEO_PUNK,Neo Punk,Neo Punk,155,154760,1,5874,6618,1,2051,216,99,55,98,39,30,35,95,45,10,12,0,3,24,0x3095,300,1500,500,1000,0,0,0,0,0,0,0,7001,3000,715,500,1061,500,1057,1500,2502,8,5110,50,0,0,0,0,0,0,4628,1 +2920,ARC_ELDER,Arc Elder,Arc Elder,168,293640,1,9086,17532,3,2513,802,105,41,100,63,35,99,106,61,10,12,2,7,80,0x3885,165,1552,1152,336,0,0,0,0,0,0,0,7099,3000,7117,1000,1564,5,1473,1,616,2,22515,1500,7939,500,0,0,0,0,4629,1 +2921,OWL_VISCOUNT,Owl Viscount,Owl Viscount,168,295240,1,9086,11089,1,4368,900,113,45,87,51,45,88,106,50,10,12,2,6,60,0x6203695,195,1345,824,440,0,0,0,0,0,0,0,7071,2500,7063,1000,18874,1,747,1,2971,2,16024,1,15089,1,0,0,0,0,4631,1 +2922,G_OWL_VISCOUNT,Owl Viscount,Owl Viscount,168,295240,1,0,0,1,4368,900,113,45,87,51,45,88,106,50,10,12,2,6,60,0x6203695,195,1345,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 +2923,OWL_MARQUEES,Owl Marquis,Owl Marquis,170,630000,1,21747,13806,2,1887,603,127,25,112,65,55,102,108,72,10,12,2,6,60,0x6203695,175,1345,824,440,0,0,0,0,0,0,0,7071,2000,7063,1500,1716,1,1472,1,15089,3,1668,1,18874,1,0,0,0,0,4632,1 2924,T_ELDER_WILOW,Elder Willow,Elder Willow,34,599,1,116,131,1,80,14,45,0,10,14,25,0,29,0,10,12,1,3,43,0x3095,200,1372,672,432,0,0,0,0,0,0,0,6067,500,7406,500,7407,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0 2925,T_WILOW,Willow,Willow,8,91,1,31,23,1,13,5,38,2,13,3,8,5,12,5,10,12,1,3,22,0x81,200,1672,672,432,0,0,0,0,0,0,0,6065,500,6066,500,6067,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0 2926,T_HARPY,Harpy,Harpy,83,4423,1,660,760,1,340,41,69,44,71,39,50,31,125,12,10,12,1,6,64,0x3885,155,972,672,470,0,0,0,0,0,0,0,7406,500,7407,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -2228,7 +2228,7 @@ //3071,PERE3 //3072,PERE4 //3073,GRAND_PERE -//3074,TIMEHOLDER +3074,TIMEHOLDER,Time Holder,Time Holder,170,25000000,1,2291250,1938750,1,5250,2100,288,265,224,152,251,257,402,77,10,12,2,6,80,0x6283695,100,398,384,288,2291250,0,0,0,0,0,0,1095,3000,2121,10,7054,3000,22515,3000,18874,20,16024,5,15089,3,0,0,0,0,4625,1 //3075,WA_TREASURE //3076,WA_MONSTER_1 //3077,WA_MONSTER_2 diff --git a/db/re/mob_skill_db.txt b/db/re/mob_skill_db.txt index a712f96fff..785d44136f 100644 --- a/db/re/mob_skill_db.txt +++ b/db/re/mob_skill_db.txt @@ -10264,68 +10264,71 @@ 2913,Acidus Ringleader@NPC_SUMMONSLAVE,idle,196,2,10000,700,30000,no,self,slavele,0,1716,,,,,, // Nightmare Clock Tower Dungeon -//2916,Big Ben@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,,6, -//2916,Big Ben@NPC_GROUNDATTACK,attack,185,3,500,500,5000,no,target,always,0,,,,,,6, -//2916,Big Ben@NPC_STUNATTACK,attack,179,3,500,1500,5000,no,target,always,0,,,,,,6, -//2916,Big Ben@NPC_EMOTION_ON,attack,474,1,10000,0,30000,yes,self,always,0,6,0x3885,,,,, -//2916,Big Ben@NPC_EMOTION,idle,197,1,200,0,30000,yes,self,always,0,9,0x91,,,,, -//2917,Big Bell@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,, -//2917,Big Bell@NPC_DARKBREATH,attack,202,2,500,800,5000,no,target,always,0,,,,,,7, -//2917,Big Bell@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,, -//2917,Big Bell@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,6,0x3695,,,,, -//2917,Big Bell@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,6, -//2918,Time Keeper@AL_TELEPORT,idle,26,1,500,0,5000,yes,self,always,0,,,,,,, -//2918,Time Keeper@WZ_FIREPILLAR,idle,80,5,500,0,5000,yes,around2,always,0,,,,,,9, -//2918,Time Keeper@SA_DISPELL,attack,289,1,500,0,30000,yes,target,always,0,,,,,,, -//2918,Time Keeper@NPC_SILENCEATTACK,attack,178,5,500,700,5000,no,target,always,0,,,,,,9, -//2918,Time Keeper@NPC_SILENCEATTACK,chase,178,5,500,700,5000,no,target,always,0,,,,,,9, -//2918,Time Keeper@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,target,always,0,,,,,,9, -//2918,Time Keeper@NPC_SLEEPATTACK,chase,182,5,500,0,5000,yes,target,always,0,,,,,,9, -//2918,Time Keeper@NPC_EMOTION_ON,attack,474,1,10000,0,30000,yes,self,always,0,6,0x3885,,,,, -//2918,Time Keeper@NPC_EMOTION,idle,197,1,200,0,30000,yes,self,always,0,9,0x91,,,,, -//2919,Neo Punk@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,, -//2919,Neo Punk@NPC_PETRIFYATTACK,attack,180,3,500,500,5000,no,target,always,0,,,,,,7, -//2919,Neo Punk@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,, -//2919,Neo Punk@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,7,0x3095,,,,, -//2919,Neo Punk@NPC_WINDATTACK,attack,187,1,2000,0,5000,yes,target,always,0,,,,,,, -//2920,Arc Elder@MG_FIREBOLT,attack,19,7,10000,1500,5000,yes,target,always,0,,,,,,11, -//2920,Arc Elder@MG_FROSTDIVER,chase,15,9,10000,500,5000,yes,target,always,0,,,,,,, -//2920,Arc Elder@MG_LIGHTNINGBOLT,chase,20,7,10000,1500,5000,yes,target,always,0,,,,,,12, -//2920,Arc Elder@MG_STONECURSE,attack,16,10,10000,0,5000,yes,target,always,0,,,,,,11, -//2920,Arc Elder@SA_DISPELL,attack,289,1,0,0,30000,yes,target,always,0,,,,,,, -//2920,Arc Elder@NPC_SILENCEATTACK,attack,178,5,500,700,5000,no,target,always,0,,,,,,, -//2920,Arc Elder@MG_FIREBOLT,idle,19,7,10000,1500,5000,yes,randomtarget,always,0,,,,,,11, -//2920,Arc Elder@MG_FROSTDIVER,idle,15,9,10000,500,5000,yes,randomtarget,always,0,,,,,,, -//2920,Arc Elder@MG_LIGHTNINGBOLT,idle,20,7,10000,1500,5000,yes,randomtarget,always,0,,,,,,12, -//2920,Arc Elder@MG_STONECURSE,idle,16,10,10000,0,5000,yes,randomtarget,always,0,,,,,,11, -//2921,Owl Viscount@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, -//2921,Owl Viscount@MG_LIGHTNINGBOLT,attack,20,3,2000,0,5000,yes,target,always,0,,,,,,, -//2921,Owl Viscount@MG_LIGHTNINGBOLT,chase,20,3,2000,0,5000,yes,target,always,0,,,,,,, -//2921,Owl Viscount@PR_LEXDIVINA,attack,76,3,500,1000,5000,yes,target,always,0,,,,,,, -//2921,Owl Viscount@PR_LEXDIVINA,chase,76,3,500,1000,5000,yes,target,always,0,,,,,,, -//2921,Owl Viscount@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,32,,,,,, -//2921,Owl Viscount@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0xA1,,,,, -//2921,Owl Viscount@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,6,0x37B5,,,,, -//2923,Owl Marquees@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, -//2923,Owl Marquees@MG_LIGHTNINGBOLT,attack,20,5,2000,0,5000,yes,target,always,0,,,,,,, -//2923,Owl Marquees@MG_LIGHTNINGBOLT,chase,20,5,2000,0,5000,yes,target,always,0,,,,,,, -//2923,Owl Marquees@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,32,,,,,, -//2923,Owl Marquees@SA_DISPELL,attack,289,5,0,0,30000,yes,target,always,0,,,,,,5, -//2923,Owl Marquees@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0xA1,,,,, -//2923,Owl Marquees@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,6,0x37B5,,,,, -//2923,Owl Marquees@NPC_SUMMONSLAVE,idle,196,2,10000,2000,60000,no,self,slavele,0,2921,,,,,, -//3074,Timeholder@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, -//3074,Timeholder@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, -//3074,Timeholder@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, -//3074,Timeholder@NPC_AGIUP,attack,350,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,, -//3074,Timeholder@AL_INCAGI,chase,29,10,2000,700,300000,no,self,always,0,,,,,,, -//3074,Timeholder@AL_DECAGI,attack,30,48,500,0,20000,no,target,always,0,,,,,,, -//3074,Timeholder@AL_DECAGI,chase,30,48,500,0,20000,no,target,always,0,,,,,,, -//3074,Timeholder@WZ_METEOR,attack,83,11,5000,500,2000,no,target,always,0,,,,,,, -//3074,Timeholder@WZ_METEOR,chase,83,11,5000,500,2000,no,target,skillused,18,,,,,,, -//3074,Timeholder@WZ_METEOR,chase,83,11,5000,500,2000,no,target,always,0,,,,,,, -//3074,Timeholder@NPC_HELLJUDGEMENT,chase,662,10,10000,1000,10000,no,self,always,0,,,,,,, -//3074,Timeholder@NPC_HELLJUDGEMENT,attack,662,10,10000,1000,10000,no,self,always,0,,,,,,, -//3074,Timeholder@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,, -//3074,Timeholder@NPC_SUMMONSLAVE,attack,196,5,10000,700,10000,no,self,slavele,0,2917,,,,,, -//3074,Timeholder@NPC_SUMMONSLAVE,idle,196,5,10000,700,10000,no,self,slavele,0,2917,,,,,, +2916,Big Ben@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,,6, +2916,Big Ben@NPC_GROUNDATTACK,attack,185,3,500,500,5000,no,target,always,0,,,,,,6, +2916,Big Ben@NPC_STUNATTACK,attack,179,3,500,1500,5000,no,target,always,0,,,,,,6, +2916,Big Ben@NPC_EMOTION,idle,197,1,200,0,30000,yes,self,always,0,9,0x0091,,,,, +2916,Big Ben@NPC_POWERUP,attack,349,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,6, +2917,Big Bell@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,, +2917,Big Bell@NPC_DARKBREATH,attack,202,2,500,800,5000,no,target,always,0,,,,,,7, +2917,Big Bell@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x0081,,,,, +2917,Big Bell@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,6,0x3695,,,,, +2917,Big Bell@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,6, +2917,Big Bell@LK_SPIRALPIERCE,attack,397,5,10000,1000,10000,yes,target,myhpltmaxrate,80,,,,,,36, +2917,Big Bell@NPC_STONESKIN,attack,675,3,10000,0,30000,yes,self,always,,,,,,,6, +2918,Time Keeper@AL_TELEPORT,idle,26,1,500,0,5000,yes,self,always,0,,,,,,, +2918,Time Keeper@WZ_FIREPILLAR,idle,80,5,500,0,5000,yes,around2,always,0,,,,,,9, +2918,Time Keeper@SA_DISPELL,attack,289,1,500,0,30000,yes,target,always,0,,,,,,, +2918,Time Keeper@NPC_SILENCEATTACK,attack,178,5,500,700,5000,no,target,always,0,,,,,,9, +2918,Time Keeper@NPC_SILENCEATTACK,chase,178,5,500,700,5000,no,target,always,0,,,,,,9, +2918,Time Keeper@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,target,always,0,,,,,,9, +2918,Time Keeper@NPC_SLEEPATTACK,chase,182,5,500,0,5000,yes,target,always,0,,,,,,9, +2918,Time Keeper@NPC_EMOTION_ON,attack,474,1,10000,0,30000,yes,self,always,0,6,0x3885,,,,, +2918,Time Keeper@NPC_EMOTION,idle,197,1,200,0,30000,yes,self,always,0,9,0x0091,,,,, +2919,Neo Punk@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,, +2919,Neo Punk@NPC_PETRIFYATTACK,attack,180,3,500,500,5000,no,target,always,0,,,,,,7, +2919,Neo Punk@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x0081,,,,, +2919,Neo Punk@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,7,0x3095,,,,, +2919,Neo Punk@NPC_WINDATTACK,attack,187,1,2000,0,5000,yes,target,always,0,,,,,,, +2919,Neo Punk@NPC_MENTALBREAKER,attack,159,1,500,800,5000,no,target,always,,,,,,,, +2920,Arc Elder@MG_FIREBOLT,attack,19,7,10000,1500,5000,yes,target,always,0,,,,,,11, +2920,Arc Elder@MG_FROSTDIVER,chase,15,9,10000,500,5000,yes,target,always,0,,,,,,, +2920,Arc Elder@MG_LIGHTNINGBOLT,chase,20,7,10000,1500,5000,yes,target,always,0,,,,,,12, +2920,Arc Elder@MG_STONECURSE,attack,16,10,10000,0,5000,yes,target,always,0,,,,,,11, +2920,Arc Elder@MG_FIREBOLT,idle,19,7,10000,1500,5000,yes,randomtarget,always,0,,,,,,11, +2920,Arc Elder@MG_FROSTDIVER,idle,15,9,10000,500,5000,yes,randomtarget,always,0,,,,,,, +2920,Arc Elder@MG_LIGHTNINGBOLT,idle,20,7,10000,1500,5000,yes,randomtarget,always,0,,,,,,12, +2920,Arc Elder@MG_STONECURSE,idle,16,10,10000,0,5000,yes,randomtarget,always,0,,,,,,11, +2920,Arc Elder@NPC_STONESKIN,attack,675,3,10000,0,30000,yes,self,always,,,,,,,6, +2920,Arc Elder@NPC_RUN,attack,354,1,10000,0,0,yes,self,myhpltmaxrate,99,,,,,,26, +2920,Arc Elder@NPC_RUN,chase,354,1,10000,0,0,yes,self,myhpltmaxrate,99,,,,,,26, +2921,Owl Viscount@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, +2921,Owl Viscount@MG_LIGHTNINGBOLT,attack,20,5,2000,0,5000,yes,target,always,0,,,,,,, +2921,Owl Viscount@MG_LIGHTNINGBOLT,chase,20,5,2000,0,5000,yes,target,always,0,,,,,,, +2921,Owl Viscount@PR_LEXAETERNA,attack,78,1,500,1000,5000,yes,target,always,,,,,,,6, +2921,Owl Viscount@PR_LEXAETERNA,chase,78,1,500,1000,5000,yes,target,always,,,,,,,6, +2921,Owl Viscount@CR_REFLECTSHIELD,attack,252,10,10000,0,300000,yes,self,always,,,,,,,6, +2921,Owl Viscount@CR_REFLECTSHIELD,chase,252,10,10000,0,300000,yes,self,always,,,,,,,6, +2921,Owl Viscount@NPC_STONESKIN,attack,675,3,10000,0,30000,yes,self,always,,,,,,,6, +2921,Owl Viscount@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,32,,,,,, +2921,Owl Viscount@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x0081,,,,, +2921,Owl Viscount@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,6,0x3695,,,,, +2923,Owl Marquees@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, +2923,Owl Marquees@MG_LIGHTNINGBOLT,attack,20,3,2000,0,5000,yes,target,always,0,,,,,,, +2923,Owl Marquees@MG_LIGHTNINGBOLT,chase,20,3,2000,0,5000,yes,target,always,0,,,,,,, +2923,Owl Marquees@NPC_STONESKIN,attack,675,3,10000,0,30000,yes,self,always,,,,,,,6, +2923,Owl Marquees@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,32,,,,,, +2923,Owl Marquees@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x0081,,,,, +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,,,,,, +3074,Time Holder@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,, +3074,Time Holder@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, +3074,Time Holder@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,, +3074,Time Holder@NPC_AGIUP,attack,350,5,10000,0,10000,yes,self,myhpltmaxrate,30,,,,,,, +3074,Time Holder@AL_INCAGI,chase,29,10,2000,700,10000,no,self,always,0,,,,,,, +3074,Time Holder@WZ_METEOR,attack,83,11,1000,500,10000,no,target,always,0,,,,,,, +3074,Time Holder@NPC_HELLJUDGEMENT,chase,662,10,3000,1000,10000,no,self,always,0,,,,,,, +3074,Time Holder@NPC_HELLJUDGEMENT,attack,662,10,3000,1000,10000,no,self,always,0,,,,,,, +3074,Time Holder@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,, +3074,Time Holder@NPC_SUMMONSLAVE,attack,196,5,1000,700,10000,no,self,slavele,0,2917,,,,,, +3074,Time Holder@NPC_SUMMONSLAVE,idle,196,5,1000,700,10000,no,self,slavele,0,2917,,,,,, diff --git a/npc/re/mapflag/nobranch.txt b/npc/re/mapflag/nobranch.txt index 95cec7dd1e..8f0d8dbb07 100644 --- a/npc/re/mapflag/nobranch.txt +++ b/npc/re/mapflag/nobranch.txt @@ -13,6 +13,7 @@ //===== Additional Comments: ================================= //= 1.0 Renewal split. [Euphy] //= 1.1 Added Izlude duplicates. [Euphy] +//= 1.2 Added Nightmare Clock Tower [Lemongrass] //============================================================ // 3rd Class Job Maps & Paradise @@ -75,6 +76,8 @@ ma_zif09 mapflag nobranch 1@ma_h mapflag nobranch 1@ma_c mapflag nobranch 1@ma_b mapflag nobranch +c_tower2_ mapflag nobranch +c_tower3_ mapflag nobranch // Episode 14.2 ================ eclage mapflag nobranch diff --git a/npc/re/mapflag/nomemo.txt b/npc/re/mapflag/nomemo.txt index 0d21763a20..aeb6bf16e1 100644 --- a/npc/re/mapflag/nomemo.txt +++ b/npc/re/mapflag/nomemo.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= @@ -11,6 +11,7 @@ //= Also disables marriage warp skills. //===== Additional Comments: ================================= //= 1.0 Renewal split. [Euphy] +//= 1.1 Added Nightmare Clock Tower [Secret] //============================================================ // Episode 13 ==================== @@ -99,6 +100,8 @@ ecl_tdun04 mapflag nomemo ecl_hub01 mapflag nomemo moc_prydn1 mapflag nomemo moc_prydn2 mapflag nomemo +c_tower2_ mapflag nomemo +c_tower3_ mapflag nomemo //Orc's Memory =================== 1@orcs mapflag nomemo diff --git a/npc/re/mobs/dungeons/c_tower.txt b/npc/re/mobs/dungeons/c_tower.txt index fc1250191f..f03243e8e1 100644 --- a/npc/re/mobs/dungeons/c_tower.txt +++ b/npc/re/mobs/dungeons/c_tower.txt @@ -3,11 +3,12 @@ //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= rAthena Project //===== Additional Comments: ================================= //= 1.0 Split from combined Alde and CT spawn file. [L0ne_W0lf] +//= 1.1 Added nightmare clock tower. [Ridley8819] //============================================================ //================================================== @@ -47,3 +48,25 @@ c_tower4,0,0,0,0 monster Mimic 1191,12,5000,0,0 c_tower4,0,0,0,0 monster Whisper 1179,5,5000,0,0 c_tower4,0,0,0,0 monster Clock Tower Manager 1270,3,5000,0,0 c_tower4,0,0,0,0 monster Elder 1377,2,5000,0,0 + +//================================================== +// c_tower2_ - Clock Tower Nightmare 2f +//================================================== +c_tower2_,0,0,0,0 monster Mimic (Nightmare) 2479,3,5000,0,0 +c_tower2_,0,0,0,0 monster Rideword (Nightmare) 2478,4,300000,0,0 +c_tower2_,0,0,0,0 monster Rideword (Nightmare) 2478,1,60000,0,0 +c_tower2_,0,0,0,0 monster Neo Punk 2919,40,5000,0,0 +c_tower2_,0,0,0,0 monster Big Ben 2916,40,5000,0,0 +c_tower2_,0,0,0,0 monster Time Keeper 2918,1,5000,0,0 +c_tower2_,0,0,0,0 monster Arc Elder 2920,2,3600000,0,0 + +//================================================== +// c_tower3_ - Clock Tower Nightmare 3f +//================================================== +c_tower3_,0,0,0,0 monster Mimic (Nightmare) 2479,8,5000,0,0 +c_tower3_,0,0,0,0 monster Rideword (Nightmare) 2478,8,5000,0,0 +c_tower3_,0,0,0,0 monster Big Bell 2917,110,5000,0,0 +c_tower3_,0,0,0,0 monster Time Keeper 2918,3,5000,0,0 +c_tower3_,0,0,0,0 monster Owl Viscount 2921,1,5000,1800000,0 +c_tower3_,0,0,0,0 monster Owl Marquis 2923,1,5000,5000,0 +c_tower3_,0,0,0,0 boss_monster Time Holder 3074,1,7200000,0,0 diff --git a/npc/re/quests/quests_aldebaran.txt b/npc/re/quests/quests_aldebaran.txt new file mode 100644 index 0000000000..4d4b8297c5 --- /dev/null +++ b/npc/re/quests/quests_aldebaran.txt @@ -0,0 +1,108 @@ +//===== rAthena Script ======================================= +//= NPCs related to Aldebaran Clock Tower (Nightmare) +//===== By: ================================================== +//= Ridley8819 +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= rAthena Project +//===== Additional Comments: ================================= +//= 1.0 Initial release [Ridley8819] +//= 1.1 Dialogue cleanup [Aleos] +//============================================================ + +c_tower1,232,222,5 script Belljamin Button#ct 968,{ + mes "[Belljamin Button]"; + mes "The monsters here are able to control time."; + if( BaseLevel < 150 ){ + mes "Come back when you've reached ^0000FFLevel 150^000000."; + close; + } + mes "Time, memories, environments... all can become warped here."; + next; + mes "[Belljamin Button]"; + mes "I'm begging you not to ask more about it. It might put your life in danger."; + next; + switch( select( "Don't ask:Go to 2nd floor of warped tower:Go to 3rd floor of warped tower" ) ){ + case 1: + break; + case 2: + case 3: + if( @menu == 2 ){ + .@map$ = "c_tower2_"; + .@x = 268; + .@y = 26; + }else{ + .@map$ = "c_tower3_"; + .@x = 65; + .@y = 147; + } + mes "[Belljamin Button]"; + mes "Be careful with your choice."; + next; + mes "[Belljamin Button]"; + mes "I need ^0000FF10,000z^000000 to let you in. It's a pretty dangerous place to be."; + next; + switch( select( "Quit:Pay 10,000z:Why do you need money?" ) ){ + case 1: + break; + case 2: + if( Zeny < 10000 ){ + mes "[Belljamin Button]"; + mes "Really? You don't have the money and asked me to take you there?"; + close; + } + Zeny -= 10000; + mes "[Belljamin Button]"; + mes "I'm not sure how you'll keep track of time in there but be as careful as you can."; + close2; + warp .@map$, .@x, .@y; + end; + case 3: + mes "[Belljamin Button]"; + mes "I am here all day for the safety of adventurers. I always alert them about the danger. That's why I need some form of payment."; + emotion e_swt; + close; + } + break; + } + mes "[Belljamin Button]"; + mes "Phew...You've made a good choice. This place is brutal so you should probably get back to a safe area."; + close; +} + +c_tower2_,274,26,3 script Belljamin Button#nct1 962,{ + mes "[Belljamin Button]"; + mes "Perhaps you've seen me before?"; + next; + mes "[Belljamin Button]"; + mes "You saw me in a different place, with a different look."; + next; + if( select( "Who are you?:Get me out of here!" ) == 1 ){ + mes "[Belljamin Button]"; + mes "Can you explain to me what you've seen, what you've done?"; + next; + mes "[Belljamin Button]"; + mes "Me too. You might also be a missing one. Unaware, with no purpose nor idea."; + next; + mes "[Belljamin Button]"; + mes "It's time to go back. Please cherish your time some more."; + next; + if( select( "Stay a little bit more:Please take me back" ) == 1 ){ + mes "[Belljamin Button]"; + mes "You must really like this place. Well, do whatever you want."; + close; + } + }else{ + mes "[Belljamin Button]"; + mes "It's time to move on. Do you have a favorite drink?"; + next; + } + mes "[Belljamin Button]"; + mes "Think about the drink in a cup. Slowly stir the cup with a spoon and peer through as the drink changes color."; + close2; + warp "c_tower1", 235, 223; + end; +} + +c_tower3_,59,148,5 duplicate(Belljamin Button#nct1) Belljamin Button#nct2 574 diff --git a/npc/re/scripts_athena.conf b/npc/re/scripts_athena.conf index b6cee5ae41..b83341a52e 100644 --- a/npc/re/scripts_athena.conf +++ b/npc/re/scripts_athena.conf @@ -136,6 +136,7 @@ npc: npc/re/quests/mrsmile.txt npc: npc/re/quests/ninja_quests.txt npc: npc/re/quests/pile_bunker.txt npc: npc/re/quests/quests_13_1.txt +npc: npc/re/quests/quests_aldebaran.txt npc: npc/re/quests/quests_brasilis.txt npc: npc/re/quests/quests_dewata.txt npc: npc/re/quests/quests_dicastes.txt