From 97b61095edc48989f2b8587494aaf7fcee8330a1 Mon Sep 17 00:00:00 2001 From: Kaan Soral Date: Fri, 19 Jan 2024 21:03:02 +0300 Subject: [PATCH] Lunar New Year Event --- admin.py | 25 +++++++++++++++++++++++++ config.py | 11 ++++++----- design/drops.py | 10 +++++----- design/items.py | 6 +++--- design/maps.py | 16 ++++++++-------- design/precomputed.py | 2 +- docs/guide/event-lunarnewyear.html | 4 ++-- main.py | 3 ++- node/server.js | 10 ++++++++-- node/server_functions.js | 2 +- 10 files changed, 61 insertions(+), 28 deletions(-) diff --git a/admin.py b/admin.py index 8124664..37b7c83 100644 --- a/admin.py +++ b/admin.py @@ -78,6 +78,31 @@ class CommunityMapEditor(webapp.RequestHandler): copy_map(name,"test") self.response.out.write(to_pretty_num(olen(map.info.data))) +class ArtistMapEditor(webapp.RequestHandler): + # from /admin/executor set the user.info.map_editor flag to True for artists, this also unlocks the interface in the game menu + @ndb.toplevel + def get(self,name): + if not name: return + name=name.split("/")[0] + domain=gdi(self); user=get_user(self,domain) + if not user or not gf(user,"map_editor"): return self.response.out.write("Not Permitted!") + map=get_by_iid("map|%s"%name) + whtml(self,"utility/htmls/map_editor.html",domain=domain,name="main",map=map,tilesets=tilesets,community=1) + @ndb.toplevel + def post(self,name): + data=self.request.get("data") + name=name.split("/")[0] + domain=gdi(self); user=get_user(self,domain) + if not user or not gf(user,"map_editor"): return self.response.out.write("Not Permitted!") + map=get_by_iid("map|%s"%name) + if not map: map=Map(key=ndb.Key(Map,name),info=GG()) + map.info.data=json.loads(data) + process_map(map) + map.updated=datetime.now() + map.put() + copy_map(name,"test") + self.response.out.write(to_pretty_num(olen(map.info.data))) + class MapEditor(webapp.RequestHandler): @ndb.toplevel def get(self,name): diff --git a/config.py b/config.py index 59be6ff..82db971 100644 --- a/config.py +++ b/config.py @@ -1,5 +1,7 @@ # This Python file uses the following encoding: utf-8 from __future__ import with_statement +# Python3 compatibility [06/01/24] +from __future__ import print_function import os,logging,cgi if os.environ.get('SERVER_SOFTWARE', '').startswith('Dev'): try: @@ -80,13 +82,12 @@ if is_production: #maps["desertland"]["key"]="jayson_desertland_copy" pass -game_version=783 +game_version=785 SALES=4+5+388+5101+125/20 #donation+manual+macos+steam+sales update_notes=[ - "Happy Holidays!", - "Last Update [December 8th]", - "Skill related pull requests from the community merged.", - "Holiday season on Adventure Land!", + "Lunar New Year Event", + "Last Update [19th of January]", + "Adding Python3 compatibility", ] ip_to_subdomain={ #IMPORTANT: SPECIAL PAGE RULES ARE NEEDED: https://dash.cloudflare.com/b6f5a13bded5fdd273e4a1cd3777162d/adventure.land/page-rules - uss1 / eus1 was best "35.187.255.184":"asia1", diff --git a/design/drops.py b/design/drops.py index 8026654..b42969f 100644 --- a/design/drops.py +++ b/design/drops.py @@ -13,10 +13,10 @@ drops={ ], "global":[ - [0.00001,"ornament"], - [0.00003,"mistletoe"], - [0.00001,"candycane"], - [0.000001,"open","xN"], + #[0.00001,"ornament"], + #[0.00003,"mistletoe"], + #[0.00001,"candycane"], + #[0.000001,"open","xN"], #[0.00006,"ornament"], #[0.00018,"mistletoe"], #[0.00005,"candycane"], @@ -36,7 +36,7 @@ drops={ #[0.009,"open","eastereggs"], #originally 0.009 #[0.0001,"redenvelopev2"], #[0.0001,"redenvelopev3"], - #[0.00005,"greenenvelope"], + [0.00005,"greenenvelope"], #[0.0001,"redenvelopev4"], #[0.001,"candypop"], ], diff --git a/design/items.py b/design/items.py index 6d90b38..4c81419 100644 --- a/design/items.py +++ b/design/items.py @@ -5369,7 +5369,7 @@ gems={ "a":True, "s":True, #"event":True, - "quest":"mistletoe", #xmas + #"quest":"mistletoe", #xmas }, "candycane":{ "type":"gem", @@ -5381,7 +5381,7 @@ gems={ "s":True, "a":True, #"event":True, - "quest":"candycane", #xmas + #"quest":"candycane", #xmas }, "gift0":{ "type":"gem", @@ -5710,7 +5710,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 c72f168..7e35ea7 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]}, @@ -543,8 +543,8 @@ 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.lunarNewYear", + #"key":"jayson_ALMap2_v2_xmas", #xmas + "key":"jayson_ALMap2_v2.lunarNewYear", "name":"Mainland", "npcs":[ #{"id":"newupgrade","position":[-203,-174]}, @@ -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}, - {"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}, {"type":"wolfie","boundary":[236,-2232,460,-1847],"count":3}, diff --git a/design/precomputed.py b/design/precomputed.py index 0304392..9dafed6 100644 --- a/design/precomputed.py +++ b/design/precomputed.py @@ -1,2 +1,2 @@ -# Sat Dec 09 2023 23:56:27 GMT+0300 (GMT+03:00) +# Thu Jan 11 2024 18:46:56 GMT+0300 (GMT+03:00) images={"/images/tiles/characters/ninja_turtles.png":{"height":144,"width":312,"type":"png"},"/images/cosmetics/makeup/makeup1.png":{"height":120,"width":1134,"type":"png"},"/images/cosmetics/hairdo/bwhair.png":{"height":120,"width":27,"type":"png"},"/images/cosmetics/beardo/burningeyes1_anim.png":{"height":120,"width":81,"type":"png"},"/images/cosmetics/beardo/burningeyes2_anim.png":{"height":120,"width":81,"type":"png"},"/images/cosmetics/hats/bathat_anim.png":{"height":120,"width":81,"type":"png"},"/images/cosmetics/hats/gcandle_anim.png":{"height":120,"width":81,"type":"png"},"/images/cosmetics/hats/halo_anim.png":{"height":120,"width":81,"type":"png"},"/images/cosmetics/makeup/kunique.png":{"height":120,"width":108,"type":"png"},"/images/cosmetics/skins/mbw.png":{"height":144,"width":81,"type":"png"},"/images/cosmetics/armors/mabw.png":{"height":144,"width":162,"type":"png"},"/images/cosmetics/accessories/kglasses.png":{"height":120,"width":108,"type":"png"},"/images/cosmetics/gravestones/gravestone.png":{"height":64,"width":160,"type":"png"},"/images/tiles/monsters/deep_sea_king.png":{"height":320,"width":318,"type":"png"},"/images/tiles/characters/adversaries.png":{"height":288,"width":324,"type":"png"},"/images/tiles/characters/angel_wingless.png":{"height":288,"width":456,"type":"png"},"/images/tiles/characters/winners_jpa.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/winners_jpb.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/sheet_winnersa.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/sheet_winnersb.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/collection1.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/collection2.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/collection3.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/collectionx.png":{"height":288,"width":456,"type":"png"},"/images/tiles/monsters/snowman.png":{"height":144,"width":76,"type":"png"},"/images/tiles/monsters/Dragold.png":{"height":212,"width":156,"type":"png"},"/images/tiles/monsters/blackscorpion.png":{"height":256,"width":176,"type":"png"},"/images/tiles/monsters/coboldProto.png":{"height":200,"width":141,"type":"png"},"/images/tiles/monsters/liger_x.png":{"height":184,"width":150,"type":"png"},"/images/tiles/monsters/tiger.png":{"height":184,"width":150,"type":"png"},"/images/tiles/monsters/slenderman.png":{"height":200,"width":141,"type":"png"},"/images/tiles/monsters/frankenstein.png":{"height":144,"width":76,"type":"png"},"/images/tiles/characters/custom1.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/custom2.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/custom3.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/others/jsonX.png":{"height":200,"width":141,"type":"png"},"/images/tiles/monsters/mecha_gnome.png":{"height":144,"width":78,"type":"png"},"/images/tiles/monsters/harpy_b_1.png":{"height":212,"width":156,"type":"png"},"/images/tiles/monsters/harpy_b_fly_1.png":{"height":212,"width":156,"type":"png"},"/images/tiles/monsters/harpy_a_1.png":{"height":212,"width":156,"type":"png"},"/images/tiles/monsters/harpy_a_fly_1.png":{"height":212,"width":156,"type":"png"},"/images/tiles/characters/others/ship2.png":{"height":64,"width":201,"type":"png"},"/images/tiles/characters/others/newyear_tree.png":{"height":64,"width":144,"type":"png"},"/images/tiles/characters/bonus1.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/military2.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/military3.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/knights.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/chara2.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/chara3.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/chara4.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/chara6.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/chara7.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/chara8.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/automatron2.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/npc1.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/npc3.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/npc4.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/npc5.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/npc6.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/dwarf2.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/tristone_m.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/tristone_f.png":{"height":288,"width":312,"type":"png"},"/images/tiles/characters/mystics.png":{"height":144,"width":312,"type":"png"},"/images/tiles/monsters/creatures1.png":{"height":144,"width":312,"type":"png"},"/images/tiles/monsters/creatures2.png":{"height":424,"width":624,"type":"png"},"/images/tiles/monsters/jrpumpkins.png":{"height":144,"width":155,"type":"png"},"/images/tiles/characters/chara5.png":{"height":288,"width":312,"type":"png"},"/images/tiles/items/chests.png":{"height":288,"width":504,"type":"png"},"/images/tiles/characters/animationc.png":{"height":400,"width":564,"type":"png"},"/images/tiles/characters/animation1i.png":{"height":400,"width":564,"type":"png"},"/images/tiles/characters/animation2.png":{"height":400,"width":564,"type":"png"},"/images/tiles/characters/animation3.png":{"height":400,"width":564,"type":"png"},"/images/tiles/monsters/elemental.png":{"height":512,"width":720,"type":"png"},"/images/tiles/monsters/monster_dknight1.png":{"height":200,"width":141,"type":"png"},"/images/tiles/monsters/monster_dknight2.png":{"height":200,"width":141,"type":"png"},"/images/tiles/monsters/fairies.png":{"height":288,"width":312,"type":"png"},"/images/tiles/monsters/monster_bird1.png":{"height":228,"width":183,"type":"png"},"/images/tiles/monsters/monster_bird2.png":{"height":228,"width":183,"type":"png"},"/images/tiles/monsters/monster_bird3.png":{"height":228,"width":183,"type":"png"},"/images/tiles/monsters/monster_boar.png":{"height":264,"width":195,"type":"png"},"/images/tiles/monsters/monster_cacto.png":{"height":200,"width":141,"type":"png"},"/images/tiles/monsters/rudolphi.png":{"height":264,"width":195,"type":"png"},"/images/tiles/monsters/monster_elk.png":{"height":264,"width":195,"type":"png"},"/images/tiles/monsters/monster_golem1.png":{"height":200,"width":141,"type":"png"},"/images/tiles/monsters/monster_golem2.png":{"height":200,"width":141,"type":"png"},"/images/tiles/monsters/monster_lich.png":{"height":200,"width":141,"type":"png"},"/images/tiles/monsters/monster_lizardman1.png":{"height":200,"width":141,"type":"png"},"/images/tiles/monsters/monster_lizardman2.png":{"height":200,"width":141,"type":"png"},"/images/tiles/monsters/stompy3.png":{"height":200,"width":141,"type":"png"},"/images/tiles/monsters/monster_minotaur.png":{"height":200,"width":141,"type":"png"},"/images/tiles/monsters/monster_phoenix.png":{"height":228,"width":183,"type":"png"},"/images/tiles/monsters/monster_raptor1.png":{"height":200,"width":141,"type":"png"},"/images/tiles/monsters/monster_raptor2.png":{"height":200,"width":141,"type":"png"},"/images/tiles/monsters/grinch.png":{"height":144,"width":82,"type":"png"},"/images/tiles/monsters/monster_treant.png":{"height":200,"width":141,"type":"png"},"/images/tiles/monsters/monster_wolf1.png":{"height":264,"width":195,"type":"png"},"/images/tiles/monsters/monster_wolf2.png":{"height":264,"width":195,"type":"png"},"/images/tiles/monsters/json.png":{"height":228,"width":183,"type":"png"},"/images/tiles/monsters/custom1.png":{"height":512,"width":720,"type":"png"},"/images/tiles/monsters/custom2.png":{"height":512,"width":720,"type":"png"},"/images/tiles/monsters/goos.png":{"height":256,"width":360,"type":"png"},"/images/tiles/monsters/monster1.png":{"height":512,"width":720,"type":"png"},"/images/tiles/monsters/animals1.png":{"height":288,"width":312,"type":"png"},"/images/tiles/monsters/animals2.png":{"height":288,"width":504,"type":"png"},"/images/tiles/monsters/birds1_modded.png":{"height":288,"width":504,"type":"png"},"/images/tiles/monsters/goblinos.png":{"height":288,"width":312,"type":"png"},"/images/tiles/monsters/goblinkingb.png":{"height":212,"width":156,"type":"png"},"/images/tiles/monsters/monsterc6.png":{"height":512,"width":692,"type":"png"},"/images/tiles/monsters/tinyfairies.png":{"height":288,"width":312,"type":"png"},"/images/tiles/monsters/monsterc2.png":{"height":400,"width":564,"type":"png"},"/images/tiles/monsters/robots.png":{"height":288,"width":372,"type":"png"},"/images/tiles/monsters/mage.png":{"height":288,"width":312,"type":"png"},"/images/tiles/monsters/monster2.png":{"height":512,"width":720,"type":"png"},"/images/tiles/monsters/monster3c.png":{"height":512,"width":720,"type":"png"},"/images/tiles/monsters/monster4.png":{"height":512,"width":720,"type":"png"},"/images/tiles/monsters/vampire2d.png":{"height":288,"width":312,"type":"png"},"/images/tiles/monsters/mr_pumpkin.png":{"height":144,"width":80,"type":"png"},"/images/tiles/monsters/cbee.png":{"height":144,"width":78,"type":"png"},"/images/tiles/monsters/iceGolem.png":{"height":200,"width":141,"type":"png"},"/images/tiles/monsters/green.png":{"height":144,"width":80,"type":"png"},"/images/sprites/emblems/emblems.png":{"height":96,"width":480,"type":"png"},"/images/cosmetics/skins/sskin1.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/skins/mskin1.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/skins/lskin1.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/sbody1.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/mbody1.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/mbody2.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/mbody3.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/mbody4.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/mbody5.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/mbody6.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/sarmor1.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/sarmor2.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/marmor1.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/marmor2.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/marmor3.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/marmor4.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/marmor5.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/marmor6.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/marmor7.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/marmor8.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/marmor9.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/marmor10.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/marmor11.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/marmor12.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/armors/larmor1.png":{"height":288,"width":324,"type":"png"},"/images/all_characters/lchar1.png":{"height":288,"width":324,"type":"png"},"/images/all_characters/mchar16.png":{"height":288,"width":324,"type":"png"},"/images/all_characters/schar7.png":{"height":288,"width":324,"type":"png"},"/images/all_characters/xschar2.png":{"height":288,"width":324,"type":"png"},"/images/all_characters/xxschar2.png":{"height":288,"width":324,"type":"png"},"/images/cosmetics/hairdo/hairdo1.png":{"height":120,"width":675,"type":"png"},"/images/cosmetics/hairdo/hairdo2.png":{"height":120,"width":675,"type":"png"},"/images/cosmetics/hairdo/hairdo3.png":{"height":120,"width":675,"type":"png"},"/images/cosmetics/hairdo/hairdo4.png":{"height":120,"width":675,"type":"png"},"/images/cosmetics/hairdo/hairdo5.png":{"height":120,"width":675,"type":"png"},"/images/cosmetics/hairdo/hairdo6.png":{"height":120,"width":675,"type":"png"},"/images/cosmetics/hats/hats1.png":{"height":120,"width":675,"type":"png"},"/images/cosmetics/hats/hats2.png":{"height":120,"width":675,"type":"png"},"/images/cosmetics/hats/hats3.png":{"height":120,"width":675,"type":"png"},"/images/cosmetics/hats/hats4.png":{"height":120,"width":675,"type":"png"},"/images/cosmetics/wings/wings1.png":{"height":144,"width":185,"type":"png"},"/images/cosmetics/wings/wings2.png":{"height":144,"width":128,"type":"png"},"/images/cosmetics/wings/wings3.png":{"height":144,"width":185,"type":"png"},"/images/cosmetics/wings/backpacks.png":{"height":144,"width":185,"type":"png"},"/images/cosmetics/wings/backpack2.png":{"height":144,"width":185,"type":"png"},"/images/cosmetics/tails/wolftail.png":{"height":144,"width":108,"type":"png"},"/images/cosmetics/tails/wolftail2.png":{"height":144,"width":108,"type":"png"},"/images/cosmetics/tails/wolftail3.png":{"height":144,"width":108,"type":"png"},"/images/cosmetics/makeup/smakeup.png":{"height":120,"width":27,"type":"png"},"/images/cosmetics/makeup/malemakeup.png":{"height":120,"width":378,"type":"png"},"/images/cosmetics/makeup/femalemakeupv2.png":{"height":120,"width":351,"type":"png"},"/images/cosmetics/makeup/fmakeup.png":{"height":120,"width":351,"type":"png"},"/images/cosmetics/accessories/eyeglasses.png":{"height":120,"width":1107,"type":"png"},"/images/cosmetics/beardo/beard1.png":{"height":120,"width":1107,"type":"png"},"/images/cosmetics/beardo/mask1.png":{"height":120,"width":675,"type":"png"},"/images/cosmetics/beardo/facemakeup.png":{"height":120,"width":675,"type":"png"},"/images/cosmetics/makeup/male_makeup.png":{"height":120,"width":567,"type":"png"},"/images/cosmetics/makeup/female_makeup.png":{"height":120,"width":621,"type":"png"},"/images/cosmetics/makeup/unisex_makeup.png":{"height":120,"width":648,"type":"png"},"/images/tiles/items/pack_1a.png":{"height":2048,"width":256,"type":"png"},"/images/tiles/items/pack_20vt8.png":{"height":1280,"width":320,"type":"png"},"/images/tiles/items/skills_20v6.png":{"height":260,"width":320,"type":"png"},"/images/tiles/items/custom.png":{"height":180,"width":140,"type":"png"},"/images/tiles/map/castle.png":{"height":512,"width":544,"type":"png"},"/images/tiles/map/custom2.png":{"height":560,"width":752,"type":"png"},"/images/tiles/map/custom.png":{"height":480,"width":480,"type":"png"},"/images/tiles/map/custom_a.png":{"height":320,"width":320,"type":"png"},"/images/tiles/map/doors.png":{"height":256,"width":192,"type":"png"},"/images/tiles/map/dungeon.png":{"height":416,"width":912,"type":"png"},"/images/tiles/map/house.png":{"height":1168,"width":1104,"type":"png"},"/images/tiles/map/inside.png":{"height":816,"width":832,"type":"png"},"/images/tiles/map/outside.png":{"height":832,"width":904,"type":"png"},"/images/tiles/map/puzzle.png":{"height":320,"width":336,"type":"png"},"/images/tiles/map/water_updated.png":{"height":1200,"width":704,"type":"png"},"/images/tiles/map/winter.png":{"height":640,"width":912,"type":"png"},"/images/tiles/map/fort.png":{"height":832,"width":656,"type":"png"},"/images/tiles/map/beach_v2.png":{"height":416,"width":576,"type":"png"},"/images/tiles/map/world.png":{"height":288,"width":432,"type":"png"},"/images/tiles/items/stands.png":{"height":144,"width":78,"type":"png"},"/images/tiles/map/new.png":{"height":480,"width":672,"type":"png"},"/images/tiles/map/dark_dimension.png":{"height":336,"width":464,"type":"png"},"/images/tiles/map/jungle.png":{"height":336,"width":496,"type":"png"},"/images/tiles/map/ship.png":{"height":448,"width":864,"type":"png"},"/images/tiles/map/ashlands.png":{"height":336,"width":640,"type":"png"},"/images/tiles/map/ruins.png":{"height":832,"width":704,"type":"png"},"/images/tiles/map/tree.png":{"height":576,"width":544,"type":"png"},"/images/tiles/map/lights.png":{"height":480,"width":640,"type":"png"}} diff --git a/docs/guide/event-lunarnewyear.html b/docs/guide/event-lunarnewyear.html index 2165164..af119d7 100644 --- a/docs/guide/event-lunarnewyear.html +++ b/docs/guide/event-lunarnewyear.html @@ -9,9 +9,9 @@ Dragold spanws every 3 hours. Take a chance to capture one of the very rare drops. A unique crown as a cosmetics item and Dragold's chrysalis! (to have a Dragold as a pet!)

-

+ {#

The Legendary Tiger appears to players and drops Tiger set items each time you manage to land a hit! Make sure to not hurt this peaceful and giving animal! -

+

#}
diff --git a/main.py b/main.py index d1cff96..483f098 100644 --- a/main.py +++ b/main.py @@ -1,6 +1,6 @@ from config import * from functions import * -from admin import CommunityMapEditor,Selector,Items +from admin import CommunityMapEditor,ArtistMapEditor,Selector,Items from api import load_code_api class MainHandler(webapp.RequestHandler): @@ -481,6 +481,7 @@ application = webapp.WSGIApplication([ ('/docs/?(.*)',DocsHandler), ('/map/(.*)/?(.*)',ResortEditor), ('/communitymaps/?(.*)', CommunityMapEditor), + ('/editmap/?(.*)', ArtistMapEditor), ('/communityselector/?(.*)', Selector), ('/communityitems', Items), ('/shells', PaymentsHandler), diff --git a/node/server.js b/node/server.js index 2ef941f..4ed15f1 100644 --- a/node/server.js +++ b/node/server.js @@ -169,8 +169,8 @@ var mode = { }; var events = { // SEASONS - holidayseason: true, - lunarnewyear: false, + holidayseason: false, + lunarnewyear: true, valentines: false, pinkgoo: 0, // every N minutes - 60 snowman: 20 * 60, // 1200 normally - 60 - at sprocess_game_data @@ -10497,6 +10497,12 @@ function init_io() { } } }); + socket.on("skin",function(data){ + var player = players[socket.id]; + if(player.role!="gm") return; + player.tskin=data.name; + resend(player, "u+cid"); + }); socket.on("legacify", function (data) { var player = players[socket.id]; if (!player || player.rip) { diff --git a/node/server_functions.js b/node/server_functions.js index cf08d69..c0feaa9 100644 --- a/node/server_functions.js +++ b/node/server_functions.js @@ -2092,7 +2092,7 @@ function event_loop() { ["holidayseason", "grinch"], ["holidayseason", "snowman"], ["lunarnewyear", "dragold"], - ["lunarnewyear", "tiger", true], + //["lunarnewyear", "tiger", true], ["valentines", "pinkgoo", true], ["egghunt", "wabbit", true], ];