diff --git a/npc/re/merchants/enchan_illusion_dungeons.txt b/npc/re/merchants/enchan_illusion_dungeons.txt index b514a0c573..8c76864abc 100644 --- a/npc/re/merchants/enchan_illusion_dungeons.txt +++ b/npc/re/merchants/enchan_illusion_dungeons.txt @@ -1010,7 +1010,7 @@ prt_fild01,141,367,3 script(CLOAKED) Esmeralda#5 4_GEFFEN_09,{ close; } mes "[Esmeralda]"; - mes "Please note that if the equipment you wish to upgrade contains the effects of a card or enchantment, it will be destroyed^000000 when used as a ^ff0000 material."; + mes "Please note that if the equipment you wish to upgrade contains the effects of a card or enchantment, it will be ^ff0000destroyed when used as a material^000000."; close2; callshop( "barter_ill_labyrinth" ); end; diff --git a/npc/re/mobs/dungeons/prt_maze.txt b/npc/re/mobs/dungeons/prt_maze.txt index 722b3dcbb8..65ac30eaf0 100644 --- a/npc/re/mobs/dungeons/prt_maze.txt +++ b/npc/re/mobs/dungeons/prt_maze.txt @@ -106,36 +106,40 @@ prt_maze03,174,187,3,3 monster Red Mushroom 1085,3,180000,90000 //================================================== // Added Illusion of Labyrinth //================================================== -prt_mz03_i monster Chaos Poporing 20531,10,5000,0,"prt_mz03_i_boss::OnMobDead" -prt_mz03_i monster Chaos Side Winder 20526,10,5000,0,"prt_mz03_i_boss::OnMobDead" -prt_mz03_i monster Chaos Hunter Fly 20527,10,5000,0,"prt_mz03_i_boss::OnMobDead" -prt_mz03_i monster Chaos Ghostring 20529,4,5000,0,"prt_mz03_i_boss::OnMobDead" -prt_mz03_i monster Chaos Killer Mantis 20530,10,5000,0,"prt_mz03_i_boss::OnMobDead" -prt_mz03_i monster Chaos Mantis 20528,10,5000,0,"prt_mz03_i_boss::OnMobDead" -prt_mz03_i monster Chaos Baphomet Jr. 20525,10,5000,0,"prt_mz03_i_boss::OnMobDead" -prt_mz03_i monster Chaotic Stem Worm 20532,6,5000,0,"prt_mz03_i_boss::OnMobDead" +prt_mz03_i monster Chaos Poporing 20531,10,5000 +prt_mz03_i monster Chaos Side Winder 20526,10,5000 +prt_mz03_i monster Chaos Hunter Fly 20527,10,5000 +prt_mz03_i monster Chaos Ghostring 20529,4,5000 +prt_mz03_i monster Chaos Killer Mantis 20530,10,5000 +prt_mz03_i monster Chaos Mantis 20528,10,5000 +prt_mz03_i monster Chaos Baphomet Jr. 20525,10,5000 +prt_mz03_i monster Chaotic Stem Worm 20532,6,5000 -// Unknown delay -prt_mz03_i monster Chaotic Andrea 20521,1,5000 -prt_mz03_i monster Chaotic Anes 20522,1,5000 -prt_mz03_i monster Chaotic Silvano 20523,1,5000 -prt_mz03_i monster Chaotic Cecilia 20524,1,5000 +prt_mz03_i monster Chaotic Andrea 20521,1,3600000,0,"prt_mz03_i_boss::OnMobDead" +prt_mz03_i monster Chaotic Anes 20522,1,3600000,0,"prt_mz03_i_boss::OnMobDead" +prt_mz03_i monster Chaotic Silvano 20523,1,3600000,0,"prt_mz03_i_boss::OnMobDead" +prt_mz03_i monster Chaotic Cecilia 20524,1,3600000,0,"prt_mz03_i_boss::OnMobDead" - script prt_mz03_i_boss -1,{ end; OnMobDead: - if (playerattached()) { - if (.count < 2500) // unknown value - .count++; - if (!.boss_spawn && !.cooldown && .count == 2500) { - .boss_spawn = true; - .count = 0; - killmonster "prt_mz03_i", "prt_mz03_i_boss::OnBossDeath"; - mapannounce "prt_mz03_i", "A terrible presence has descended from beyond the chaos of the deep abyss.", bc_map, 0x70dbdb; - getunitdata( killedgid, .@data ); - monster "prt_mz03_i", .@data[UMOB_X], .@data[UMOB_Y], "--ja--", 20520,1, "prt_mz03_i_boss::OnBossDeath"; // ILL_BAPHOMET - end; - } + if (playerattached() < 1) + end; + if (.boss_spawn || .cooldown || .count[killedrid] == 1) + end; + .count[killedrid] = 1; + + if (.count[20521] == 1 && .count[20522] == 1 && .count[20523] == 1 && .count[20524] == 1) { + .boss_spawn = true; + .count[20521] = 0; + .count[20522] = 0; + .count[20523] = 0; + .count[20524] = 0; + killmonster "prt_mz03_i", "prt_mz03_i_boss::OnBossDeath"; + mapannounce "prt_mz03_i", "A terrible presence has descended from beyond the chaos of the deep abyss.", bc_map, 0x70dbdb; + getunitdata( killedgid, .@data ); + monster "prt_mz03_i", .@data[UMOB_X], .@data[UMOB_Y], "--ja--", 20520,1, "prt_mz03_i_boss::OnBossDeath"; // ILL_BAPHOMET + end; } end; OnBossDeath: diff --git a/npc/re/quests/quests_illusion_dungeons.txt b/npc/re/quests/quests_illusion_dungeons.txt index f1647980ee..3c781ffd36 100644 --- a/npc/re/quests/quests_illusion_dungeons.txt +++ b/npc/re/quests/quests_illusion_dungeons.txt @@ -12814,7 +12814,7 @@ ein_d02_i,169,244,1 script Sirumsireum Teddy Bear#ITBz02 4_TEDDY_BEAR_B_L,{ prt_maze01,99,27,0 script #iol000 HIDDEN_WARP_NPC,4,4,{ end; OnTouch: - if (BaseLevel < 180) + if (BaseLevel < 170) end; .@npc_name$ = "Twisted Crack#1"; removespecialeffect EF_GROUNDSAMPLE, AREA, .@npc_name$; @@ -13191,7 +13191,7 @@ OnInit: } prt_maze01,99,23,5 script(CLOAKED) Twisted Crack#1 CLEAR_NPC,{ - if (BaseLevel < 180) + if (BaseLevel < 170) end; if (ill_laby < 2) { mes "Beyond the twisted crack, a familiar yet unfamiliar labyrinth unfolds."; @@ -13213,7 +13213,7 @@ OnInit: } prt_maze01,97,26,5 script(CLOAKED) Irene#1 4_F_ERENE,2,2,{ - if (BaseLevel < 180) + if (BaseLevel < 170) end; if (ill_laby == 0) { mes "[Irene]"; @@ -13285,7 +13285,7 @@ OnTouch: OnInit: setunittitle( getnpcid(0), "" ); - questinfo( QTYPE_QUEST, QMARK_YELLOW, "BaseLevel >= 180 && ill_laby == 0" ); + questinfo( QTYPE_QUEST, QMARK_YELLOW, "BaseLevel >= 170 && ill_laby == 0" ); end; }