Replace CRC's Aqua Ticket with Christmas Ticket

7 files changed, 27 insertions, 17 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 99467306..122112a2 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -4814,6 +4814,16 @@ item_db: (
 		noselltonpc: true
 	}
 },
+{
+	Id: 5278
+	AegisName: "XmasTicket"
+	Name: "Christmas Ticket"
+	Type: "IT_ETC"
+	Buy: 0
+	Sell: 0
+	Weight: 0
+	ViewSprite: 5278
+},
 /* Chest Armor */
 {
 	Id: 523
diff --git a/npc/080-1/final.txt b/npc/080-1/final.txt
index 28982d61..de96701a 100644
--- a/npc/080-1/final.txt
+++ b/npc/080-1/final.txt
@@ -134,13 +134,13 @@ OnInstanceInit:
     end;
 
 OnCountFunds:
-	setcurrency(countitem(AquaTicket));
+	setcurrency(countitem(XmasTicket));
 	end;
 
 /* @price is total cost. @points is if we accept two items as currency. */
 OnPayFunds:
 	//dispbottom "Hi: price="+@price+" and points="+@points;
-	if( countitem(AquaTicket) < @price )
+	if( countitem(XmasTicket) < @price )
 		end;
     /* Verify if you're not purchasing a dupe */
     /* This requires servercode@712c09c2c6d848243c3426aeb3dbdf730c1e0b08 to work */
@@ -158,7 +158,7 @@ OnPayFunds:
             end;
         }
     }
-	delitem AquaTicket, @price;
+	delitem XmasTicket, @price;
     /* Record the items on the bitmask (far more important) */
     /* This requires servercode@712c09c2c6d848243c3426aeb3dbdf730c1e0b08 to work */
     for (.@i=0;.@i < getarraysize(@bought_nameid); .@i++) {
@@ -182,7 +182,7 @@ OnPayFunds:
     }
     delcells("X21LF@"+X21ID());
     specialeffect(FX_MAGIC_WICKED_SPAWN, AREA, getcharid(3));
-    getitem AquaTicket, X21_TICKET_BOSS;
+    getitem XmasTicket, X21_TICKET_BOSS;
     'XMAS21FINAL = true;
     maptimer2(getmap(), 10, "#X21BarrierF::OnSesame");
     end;
@@ -191,12 +191,12 @@ OnInit:
     end;
 OnSesame:
     dispbottom l("Without the guardians, the illusion is just that: An illusion. The path is clear.");
-    getitem AquaTicket, X21_TICKET_SUPPORT;
+    getitem XmasTicket, X21_TICKET_SUPPORT;
     getexp X21_EXP_PUZZLE, 0;
     end;
 OnKil:
     mapannounce getmap(), "One of the guardians has been eliminated by "+strcharinfo(0), 0;
-    getitem AquaTicket, X21_TICKET_SUPPORT + 1;
+    getitem XmasTicket, X21_TICKET_SUPPORT + 1;
     X21INIT();
     end;
 }
diff --git a/npc/081-1/dungeon.txt b/npc/081-1/dungeon.txt
index f99283fa..db76c51b 100644
--- a/npc/081-1/dungeon.txt
+++ b/npc/081-1/dungeon.txt
@@ -131,7 +131,7 @@ function complete {
     mesq l("Thanks for helping Santa yet again.");
     next;
     mesn;
-    mesq l("I believe he has been trading %s... Do you want to meet him again?", getitemlink(AquaTicket));
+    mesq l("I believe he has been trading %s... Do you want to meet him again?", getitemlink(XmasTicket));
     next;
     if (askyesno() == ASK_YES) dowarp();
     close;
diff --git a/npc/081-2/logic.txt b/npc/081-2/logic.txt
index 1120ad28..ae755033 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, X21_TICKET_PUZZLE;
+        getitem XmasTicket, X21_TICKET_PUZZLE;
         X21INIT();
     }
     closeclientdialog;
@@ -202,7 +202,7 @@ OnPlant:
         delcells("X21L2@"+X21ID());
         specialeffect(FX_MAGIC_WICKED_SPAWN, AREA, getcharid(3));
         getexp X21_EXP_PUZZLE, 0;
-        getitem AquaTicket, X21_TICKET_PUZZLE;
+        getitem XmasTicket, X21_TICKET_PUZZLE;
         X21INIT();
     }
     end;
@@ -241,7 +241,7 @@ OnInit:
         'XMAS21AMBUSH = true;
         specialeffect(FX_MAGIC_WICKED_SPAWN, AREA, getcharid(3));
         getexp X21_EXP_PUZZLE, 0;
-        getitem AquaTicket, X21_TICKET_PUZZLE;
+        getitem XmasTicket, X21_TICKET_PUZZLE;
         X21INIT();
     } else {
         npctalk l("*click*");
diff --git a/npc/081-3/logic.txt b/npc/081-3/logic.txt
index d77bd34c..02f353b1 100644
--- a/npc/081-3/logic.txt
+++ b/npc/081-3/logic.txt
@@ -69,7 +69,7 @@ OnFin:
     }
     killmonsterall(getmap());
     getexp 10000, 0;
-    getitem AquaTicket, 1 + 'BC1LV;
+    getitem XmasTicket, 1 + 'BC1LV;
     maptimer(getmap(), 10, "Pentagram#Xmas21A::OnFlush");
     end;
 
@@ -85,7 +85,7 @@ OnFlush:
     @BC1ME = 0;
     .@id = X21ID();
     $@XMAS21_BC1[.@id] = X21BC1_OFF;
-    getitem AquaTicket, X21_TICKET_SUPPORT + ('BC1LV / 2);
+    getitem XmasTicket, X21_TICKET_SUPPORT + ('BC1LV / 2);
     end;
 
 // Pseudo-Magic
diff --git a/npc/annuals/xmas/2021.txt b/npc/annuals/xmas/2021.txt
index c6ff3302..bc87c319 100644
--- a/npc/annuals/xmas/2021.txt
+++ b/npc/annuals/xmas/2021.txt
@@ -412,7 +412,7 @@ OnX1165:
     .@x=cap_value(rand2(.@x1, .@x2), 107, 126);
     .@y=cap_value(rand2(.@y1, .@y2), 159, 177);
     debugmes "GIFT BOX %d %d", .@x, .@y;
-    makeitem(AquaTicket, 1, .@m$, .@x, .@y);
+    makeitem(XmasTicket, 1, .@m$, .@x, .@y);
     end;
 
 /* Experimental */
diff --git a/npc/functions/mob_points.txt b/npc/functions/mob_points.txt
index 6f38a871..5b4b86d8 100644
--- a/npc/functions/mob_points.txt
+++ b/npc/functions/mob_points.txt
@@ -17,13 +17,13 @@ function	script	MobPoints	{
 
     if (isChristmas21() && compare(getmap(), "@"+callfunc("X21ID2"))) {
         if (getmonsterinfo(@mobId, MOB_LV) >= 150 && any(true, false))
-            getitem AquaTicket, 2;
+            getitem XmasTicket, 2;
         else if (getmonsterinfo(@mobId, MOB_LV) >= 100 && any(true, false))
-            getitem AquaTicket, 1;
+            getitem XmasTicket, 1;
         else if (getmonsterinfo(@mobId, MOB_LV) >= 40 && any(true, false, false, false))
-            getitem AquaTicket, 1;
+            getitem XmasTicket, 1;
         else if (rand2(10) == 3)
-            getitem AquaTicket, 1;
+            getitem XmasTicket, 1;
     }
 
     if (MPQUEST) {