summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/constants.conf7
-rw-r--r--npc/081-2/logic.txt4
-rw-r--r--npc/081-3/logic.txt2
-rw-r--r--npc/annuals/xmas/2021.txt4
4 files changed, 10 insertions, 7 deletions
diff --git a/db/constants.conf b/db/constants.conf
index 0b85ac76..ac58a2af 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3389,9 +3389,12 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
X21_ALYSSAINIT: 2048
X21_ALYSSARESCUE: 4096
- X21BC1_ON: 1
- X21BC1_OFF: 2
+ X21BC1_ON: 1
+ X21BC1_OFF: 2
X21_EXP_PUZZLE: 15000
+ X21_TICKET_PUZZLE: 15
+ X21_TICKET_BOSS: 5
+ X21_TICKET_SUPPORT: 2
comment__: "Focus Constants"
FSKILL_MALLARDS_EYE: 1
diff --git a/npc/081-2/logic.txt b/npc/081-2/logic.txt
index f04a8382..68feea71 100644
--- a/npc/081-2/logic.txt
+++ b/npc/081-2/logic.txt
@@ -54,7 +54,7 @@ OnTouch:
delcells("X21L1@"+X21ID());
specialeffect(FX_MAGIC_WICKED_SPAWN, AREA, getcharid(3));
getexp X21_EXP_PUZZLE, 0;
- getitem AquaTicket, 1;
+ getitem AquaTicket, X21_TICKET_PUZZLE;
X21INIT();
}
closeclientdialog;
@@ -220,7 +220,7 @@ OnInit:
'XMAS21AMBUSH = true;
specialeffect(FX_MAGIC_WICKED_SPAWN, AREA, getcharid(3));
getexp X21_EXP_PUZZLE, 0;
- getitem AquaTicket, 1;
+ getitem AquaTicket, X21_TICKET_PUZZLE;
X21INIT();
} else {
npctalk l("*click*");
diff --git a/npc/081-3/logic.txt b/npc/081-3/logic.txt
index 9e382b7d..3ff7a64a 100644
--- a/npc/081-3/logic.txt
+++ b/npc/081-3/logic.txt
@@ -68,6 +68,7 @@ OnFin:
}
killmonsterall(getmap());
getexp 10000, 0;
+ getitem AquaTicket, X21_TICKET_BOSS;
maptimer(getmap(), 10, "Pentagram#Xmas21A::OnFlush");
end;
@@ -83,6 +84,7 @@ OnFlush:
@BC1ME = 0;
.@id = X21ID();
$@XMAS21_BC1[.@id] = X21BC1_OFF;
+ getitem AquaTicket, X21_TICKET_SUPPORT;
end;
// Pseudo-Magic
diff --git a/npc/annuals/xmas/2021.txt b/npc/annuals/xmas/2021.txt
index 61d1fcbc..e9ced287 100644
--- a/npc/annuals/xmas/2021.txt
+++ b/npc/annuals/xmas/2021.txt
@@ -147,7 +147,6 @@ function script X21CANDLE_CHECK {
'XMAS21CANDLE = true;
// Record on player as well, just to be safe.
if (XMAS2021 & X21_CANDLES) return true;
- getitem AquaTicket, 5;
XMAS2021 = (XMAS2021 | X21_CANDLES);
return true;
}
@@ -174,7 +173,6 @@ function script X21SEED_CHECK {
'XMAS21TREE = true;
// Record on player as well, just to be safe.
if (XMAS2021 & X21_PLANTPUZZLE) return true;
- getitem AquaTicket, 5;
XMAS2021 = (XMAS2021 | X21_PLANTPUZZLE);
return true;
}
@@ -202,7 +200,7 @@ function script X21_SEEDS {
delcells("X21L2@"+X21ID());
specialeffect(FX_MAGIC_WICKED_SPAWN, AREA, getcharid(3));
getexp X21_EXP_PUZZLE, 0;
- getitem AquaTicket, 1;
+ getitem AquaTicket, X21_TICKET_PUZZLE;
X21INIT();
}
return;