diff options
Diffstat (limited to 'npc/annuals/xmas/2021.txt')
-rw-r--r-- | npc/annuals/xmas/2021.txt | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/npc/annuals/xmas/2021.txt b/npc/annuals/xmas/2021.txt index ca24ebcc..dee9db7c 100644 --- a/npc/annuals/xmas/2021.txt +++ b/npc/annuals/xmas/2021.txt @@ -88,7 +88,7 @@ function script X21INIT { if (X21TYPE() == IOT_PARTY) "#XMAS21Core"::spawn2(Koyntety, 70, 250, 99, 265, 1, .@mapa$, true); else - "#XMAS21Core"::spawn2(ManaGuardian, 70, 250, 99, 265, 1, .@mapa$, true); + "#XMAS21Core"::spawn2(ManaGuard, 70, 250, 99, 265, 1, .@mapa$, true); /* Northern Lights Dungeon */ "#XMAS21Core"::spawn(WhiteSlime, 37, .@mapa$); @@ -253,23 +253,7 @@ function script X21_SEEDS { return; if (.@y < 159 || .@y > 177) return; - // Should never happen, so nuke everything - //if (instance_id() < 0) end; - // Already planted this spot - if ('XMAS21TREE_X[.@x] && 'XMAS21TREE_Y[.@y]) return; - // Record the success planting it - 'XMAS21TREE_X[.@x] = true; - 'XMAS21TREE_Y[.@y] = true; - // Sprout a Christmas Tree IF position was not already filled - monster(.@m$, .@x, .@y, strmobinfo(1, ChristmasTree), ChristmasTree, 1, "#XMAS21Core::OnX1164"); - // Unlock the gate once the puzzle is complete - if (X21SEED_CHECK()) { - delcells("X21L2@"+X21ID()); - specialeffect(FX_MAGIC_WICKED_SPAWN, AREA, getcharid(3)); - getexp X21_EXP_PUZZLE, 0; - getitem AquaTicket, X21_TICKET_PUZZLE; - X21INIT(); - } + addtimer 10, instance_npcname("#X21SeedFlag", @inst)+"::OnPlant"; return; } @@ -338,6 +322,8 @@ public function spawn2 { setunitdata(.@mg, UDT_HP, .@hp); setunitdata(.@mg, UDT_ATKMIN, .@ak); setunitdata(.@mg, UDT_ATKMAX, .@ax); + } else if (.@noob) { + debugmes "WARN: Faulty %dx %d at map %s", getarg(5,1), getarg(0), .@m$; } } return; @@ -376,7 +362,7 @@ OnX1147: OnX1140: OnX1143: OnX1138: - spawn2(any(Tengu, ManaSlayer, ManaGuardian, ManaGuardian), 70, 250, 99, 265, 1, getmap(), true); + spawn2(any(Tengu, ManaSlayer, ManaGuard, ManaGuard), 70, 250, 99, 265, 1, getmap(), true); /* Give player enough fuel potions */ getmapxy(.@m$, .@x, .@y, 0); .@x1=.@x-1; @@ -407,6 +393,7 @@ OnX1165: .@y2=.@y+2; .@x=cap_value(rand2(.@x1, .@x2), 47, 65); .@y=cap_value(rand2(.@y1, .@y2), 191, 212); + debugmes "GIFT BOX %d %d", .@x, .@y; makeitem(AquaTicket, 1, .@m$, .@x, .@y); end; @@ -499,7 +486,7 @@ On1140: spawn(Tengu); end; On1138: - spawn(ManaGuardian); + spawn(ManaGuard); end; On1143: spawn(ManaSlayer); |