Holiday season

design/drops.py

@@ -16,25 +16,10 @@ drops={
 		
 		],
 		"global":[
-			#[0.00001,"ornament"],
-			#[0.00003,"mistletoe"],
-			#[0.00001,"candycane"],
-			#[0.000001,"open","xN"],
-			#[0.00006,"ornament"],
-			#[0.00018,"mistletoe"],
-			#[0.00005,"candycane"],
-			#[0.00001,"open","xN"],
-			# server.js handles Halloween drops now
-			#[0.00005,"candy0"], #originally 4X [11/10/19]
-			#[0.00125,"candy1"], #originally 4X [11/10/19]
 			#[0.000015,"goldenegg"], #originally 0.000005
 			#[0.000001,"5bucks"],
 			#[0.0002,"gift0"],
 			#[0.004,"gift1"],
-			#[0.0006,"ornament"],
-			#[0.0018,"mistletoe"],
-			#[0.0005,"candycane"],
-			#[0.0001,"open","xN"],
 			#[0.0004,"redenvelope"],
 			#[0.00005,"goldenegg"],
 			#[0.009,"open","eastereggs"], #originally 0.009

design/items.py

@@ -5370,7 +5370,7 @@ gems={
 		"a":True,
 		"s":True,
 		#"event":True,
-		#"quest":"mistletoe", #xmas
+		"quest":"mistletoe", #xmas
 	},
 	"candycane":{
 		"type":"gem",
@@ -5382,7 +5382,7 @@ gems={
 		"s":True,
 		"a":True,
 		#"event":True,
-		#"quest":"candycane", #xmas
+		"quest":"candycane", #xmas
 	},
 	"gift0":{
 		"type":"gem",
@@ -5711,7 +5711,7 @@ quest={
 		"g":3000,
 		"e":20,
 		"s":True,
-		#"quest":"ornament", #xmas
+		"quest":"ornament", #xmas
 	},
 	"lostearring":{
 		"type":"earring",

design/maps.py

@@ -247,7 +247,7 @@ maps={
 		"key":"jayson_bank",
 		"key":"jayson_bank0",
 		#"key":"jayson_bank_xmas",
-		#"key":"jayson_bank0.Xmas", #xmas
+		"key":"jayson_bank0.Xmas", #xmas
 		"name":"The Bank",
 		"npcs":[
 			{"id":"goldnpc","position":[1,-416]},
@@ -543,7 +543,7 @@ maps={
 		"key":"jayson_ALMap2_v2",
 		#"key":"jayson_ALMap2_v2.Xmas",
 		#"key":"jayson_ALMap2_v2.CNewYear",
-		#"key":"jayson_ALMap2_v2_xmas", #xmas
+		"key":"jayson_ALMap2_v2_xmas", #xmas
 		#"key":"jayson_ALMap2_v2.lunarNewYear",
 		"name":"Mainland",
 		"npcs":[
@@ -585,7 +585,7 @@ maps={
 			{"id":"pvptokens","position":[159,403]},
 			{"id":"monsterhunter","position":[126,-413]},
 			{"id":"mcollector","position":[81,-283,1]},
-			#{"id":"newyear_tree","position":[64,-88]}, #xmas
+			{"id":"newyear_tree","position":[64,-88]}, #xmas
 		],
 		"monsters":[
 			#square
@@ -1035,7 +1035,7 @@ maps={
 			{"id":"citizen1","position":[0,-5]},
 			{"id":"citizen5","position":[0,-5]},
 			{"id":"citizen6","position":[0,-5]},
-			#{"id":"mistletoe","position":[94,-181,2]}, #xmas
+			{"id":"mistletoe","position":[94,-181,2]}, #xmas
 		],
 		"monsters":[
 		],
@@ -1162,8 +1162,8 @@ maps={
 		"npcs":[
 			{"id":"leathermerchant","position":[262,-48.5]},
 			{"id":"transporter","position":[-73,-393]},
-			#{"id":"santa","position":[1242,-1631]}, #xmas
-			#{"id":"ornaments","position":[-137,-193,1]}, #xmas
+			{"id":"santa","position":[1242,-1631]}, #xmas
+			{"id":"ornaments","position":[-137,-193,1]}, #xmas
 			{"id":"guard","position":[1065,-2015]},
 			{"id":"citizen7","position":[-15,5]},
 			{"id":"citizen8","position":[-15,5]},
@@ -1173,7 +1173,7 @@ maps={
 		"monsters":[
 			{"type":"stompy","boundary":[30,-2954,836,-2536],"count":1},
 			{"type":"wolf","boundary":[30,-2954,836,-2536],"count":7,"grow":True}, #added grow 31/1/2024
-			#{"type":"rudolph","boundary":[1065,-1598,1418,-1449],"count":1}, #xmas
+			{"type":"rudolph","boundary":[1065,-1598,1418,-1449],"count":1}, #xmas
 			{"type":"arcticbee","boundary":[682,-967,1482,-779],"count":10,"grow":True},
 			{"type":"wolfie","boundary":[-367,-2234,29,-1819],"count":4,"grow":True}, #added grow 31/1/2024
 			{"type":"wolfie","boundary":[236,-2232,460,-1847],"count":3,"grow":True}, #added grow 31/1/2024