diff --git a/design/items.py b/design/items.py index 1cd0710..377635c 100644 --- a/design/items.py +++ b/design/items.py @@ -5453,7 +5453,7 @@ gems={ "a":True, "s":True, #"event":True, - "quest":"mistletoe", #xmas + #"quest":"mistletoe", #xmas }, "candycane":{ "type":"gem", @@ -5465,7 +5465,7 @@ gems={ "s":True, "a":True, #"event":True, - "quest":"candycane", #xmas + #"quest":"candycane", #xmas }, "gift0":{ "type":"gem", @@ -5794,7 +5794,7 @@ quest={ "g":3000, "e":20, "s":True, - "quest":"ornament", #xmas + #"quest":"ornament", #xmas }, "lostearring":{ "type":"earring", diff --git a/design/maps.py b/design/maps.py index f869fa4..ddf5368 100644 --- a/design/maps.py +++ b/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]}, @@ -491,7 +491,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":[ @@ -533,7 +533,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 {"id":"favors","position":[79,-47]}, ], "monsters":[ @@ -986,7 +986,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":[ ], @@ -1113,8 +1113,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]}, @@ -1124,7 +1124,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 diff --git a/node/server.js b/node/server.js index 414a1c8..6aaae7d 100644 --- a/node/server.js +++ b/node/server.js @@ -171,7 +171,7 @@ var mode = { }; var events = { // SEASONS - holidayseason: true, + holidayseason: false, lunarnewyear: false, valentines: false, pinkgoo: 0, // every N minutes - 60 @@ -3159,7 +3159,7 @@ function complete_attack(attacker, target, info) { defense = "resistance"; pierce = "rpiercing"; info.apiercing = 0; - } else if(info.damage_type == "physical") { + } else if (info.damage_type == "physical") { defense = "armor"; pierce = "apiercing"; info.rpiercing = 0;