From 1f319e042c7f6506e5b4e26dc924f5c68c6d91ea Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sun, 5 Dec 2021 23:57:13 -0300 Subject: Move the candle puzzle hints around. --- npc/080-1/final.txt | 2 ++ npc/081-2/logic.txt | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/npc/080-1/final.txt b/npc/080-1/final.txt index d534d36f..12b1b7d8 100644 --- a/npc/080-1/final.txt +++ b/npc/080-1/final.txt @@ -39,6 +39,8 @@ OnInit: OnInit: .distance=4; + // FIXME CRITICAL: Should the colored masks be featured? + // AFAIK, only the original was featured on the original event. setarray .prizes, BlinkingEvil, BlinkingEvilRed, BlinkingEvilBlue, BlinkingEvilPink, BlinkingEvilYellow, GuyFawkesMask, OperaMask, JesterMask, GoblinMask, WitchHat; diff --git a/npc/081-2/logic.txt b/npc/081-2/logic.txt index 68feea71..efc0edf0 100644 --- a/npc/081-2/logic.txt +++ b/npc/081-2/logic.txt @@ -70,7 +70,7 @@ OnInit: 081-2,134,258,0 duplicate(#X21Candle_0) #X21Candle_4 NPC_NO_SPRITE 081-2,135,251,0 duplicate(#X21Candle_0) #X21Candle_5 NPC_NO_SPRITE -081-2,83,257,0 script Hint#X21C0 NPC_NO_SPRITE,{ +081-2,79,279,0 script Hint#X21C0 NPC_NO_SPRITE,{ .@c = 0; .@c += ('COLORCODE[0] ? 0 : 1); .@c += ('COLORCODE[1] ? 0 : 1); @@ -85,7 +85,7 @@ OnInit: end; } -081-2,84,257,0 script Hint#X21C1 NPC_NO_SPRITE,{ +081-2,65,274,0 script Hint#X21C1 NPC_NO_SPRITE,{ .@c = 0; .@c += ('COLORCODE[0] == 1 ? 1 : 0); .@c += ('COLORCODE[1] == 1 ? 1 : 0); @@ -100,7 +100,7 @@ OnInit: end; } -081-2,85,257,0 script Hint#X21C2 NPC_NO_SPRITE,{ +081-2,51,271,0 script Hint#X21C2 NPC_NO_SPRITE,{ if ('COLORCODE[0] == 2) dispbottom l("The leftmost candle is magical."); else if ('COLORCODE[5] == 2) @@ -112,7 +112,7 @@ OnInit: end; } -081-2,86,257,0 script Hint#X21C3 NPC_NO_SPRITE,{ +081-2,41,267,0 script Hint#X21C3 NPC_NO_SPRITE,{ if ('COLORCODE[0] == 'COLORCODE[5]) dispbottom l("The leftmost and the rightmost candle are identical."); else @@ -122,7 +122,7 @@ OnInit: end; } -081-2,86,257,0 script Hint#X21C4 NPC_NO_SPRITE,{ +081-2,51,247,0 script Hint#X21C4 NPC_NO_SPRITE,{ .@n$ = ('COLORCODE[2] ? ('COLORCODE[2] == 1 ? "Regular" : "Magical") : "No"); dispbottom l("The northmost candle should use %s Fire.", .@n$); OnInit: @@ -130,7 +130,7 @@ OnInit: end; } -081-2,87,257,0 script Hint#X21C5 NPC_NO_SPRITE,{ +081-2,63,236,0 script Hint#X21C5 NPC_NO_SPRITE,{ .@n$=""; if (!'COLORCODE[3]) .@n$=('OBSCURECOLOR ? "Regular" : "Magical"); -- cgit v1.2.3-60-g2f50