From b4c8b9f84702e9ee07ff4729c7f2bd65d952c611 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Fri, 24 Jan 2025 16:06:28 -0700 Subject: [PATCH 01/46] New maps and potential new mob spawns Added a "Gateway" map which leads to new maps - Underground Cliffs - 4 potential mob spawns - 3 spawns and 3 doors (2 of each unused for now) - Underground Hills - 4 potential mob spawns (2 planned, 2 unplanned) - 3 spawns and 3 doors (2 of each unused, but 1 planned) - Mystical Forest - 6 potential mob spawns (3 done, 3 planned) - 1 spawn 1 door - Spider Instance - minimal plans but is technically setup as a map with entrance, death point, key requirement - further development needed - Main & Halloween changes - added a spawn and door to main that links to Gateway - added a spawn and door to halloween that links to Mystical Forest --- design/maps.py | 131 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/design/maps.py b/design/maps.py index b7c3446..519b628 100644 --- a/design/maps.py +++ b/design/maps.py @@ -676,6 +676,7 @@ maps={ [312,-335,32,32,"mtunnel",0,16], [967,-584,32,32,"mtunnel",1,17], [1472,-434,32,32,"mtunnel",2,18], + [888,-675,24,32,"gateway",0,19], ], "traps":[ {"type":"spikes","position":[-472,286]}, @@ -701,6 +702,7 @@ maps={ [294,-347,1], #16-mtunnel [968,-577], #17-mtunnel [1471,-424], #18-mtunnel + [888,-667], #19-gateway ], "quirks":[ [-236,-189,24,24,"upgrade"], @@ -1308,12 +1310,14 @@ maps={ [784,-1060], #2-spooky [-1071,-1485], #3-level1 [1212,101,3], #4-main + [-560,-990], #5-jungle ], "doors":[ #[108,-260,32,32,"spookytown",1,2], [784,-1085,80,40,"spookytown",1,2], [-1071,-1496,40,40,"level1",2,3], [1212,150,200,36,"main",15,4], + [-560,-1008,28,32,"jungle",0,0], ], "quirks":[ [-228,-178,32,40,"log","Locked but there are noises coming from inside"], @@ -1634,6 +1638,133 @@ maps={ "unlist":True, "lux":0.4, }, + "gateway":{ + "key":"jayson_pvpDungeon_gateway", + "name":"Underground [Gateway]", + "npcs":[ + ], + "monsters":[ + ], + "spawns":[ + [0,0], # Main entrance + [-320,-102], #Dungeon 1 entrance bottom left + [320,-240], #Dungeon 2 entrance top right + # [-320,-202], #Spider queen entrance + [0,-847], #Top entrance (unused) + ], + "doors":[ + [0,-47,46,36,"main",19,0], #door to main + [-321,-40,62,60,"dungeon1",1,1], #door to Dungeon 1 + [319,-249,62,46,"dungeon2",0,2], #door to Dungeon 2 + # [-321,-213,68,83,"spidercave",0,3,"key","spiderkey"], #door to spider + # [0,-859,58,44,"TBD",1,4], #door to (To Be Determined) + ], + "quirks":[ + ], + "drop_norm":1000, + "unlist":True, + "lux":0.4, + }, + "ucliffs":{ + "key":"jayson_pvpDungeon_a1", + "name":"Underground [Cliffs]", + "npcs":[ + ], + "monsters":[ + # {"type":"TBD","boundary":[586,-844,915,-589],"count":6,"grow":True}, + # {"type":"TBD","boundary":[-455,-1126,-189,-898],"count":6,"grow":True}, + # {"type":"TBD","boundary":[-135,-640,73,-545],"count":6,"grow":True}, + # {"type":"TBD","boundary":[492,-238,647,-81],"count":6,"grow":True}, + ], + "spawns":[ + [0,0], + [256,-905], # Gateway door + ], + "doors":[ + #[0,80,54,67,"TBD",0,0], #door to (To Be Determined) + [255,-917,62,99,"gateway",1,1], #door to Gateway + ], + "quirks":[ + ], + "drop_norm":5000, + "unlist":True, + "lux":0.4, + }, + "uhills":{ + "key":"jayson_pvpDungeon_a2", + "name":"Underground [Hills]", + "npcs":[ + ], + "monsters":[ + # {"type":"Robot1","boundary":[-734,-394,-416,-157],"count":6,"grow":True}, + # {"type":"Robot2","boundary":[-672,-394,-416,-120],"count":6,"grow":True}, + # {"type":"TBD","boundary":[194,-550,648,-407],"count":6,"grow":True}, + # {"type":"TBD","boundary":[-431,-646,-242,-528],"count":6,"grow":True}, + ], + "spawns":[ + [0,0], + [720,-310], # Right door + [0,-691], # New Instance? + ], + "doors":[ + [0,77,56,64,"gateway",0,0], #door to Gateway + # [720,-237,55,62,"TBD",1,1], #door to (To Be Determined) + # [0,-702,40,61,"TBD",1,1], #door to New Instance? + ], + "quirks":[ + ], + "drop_norm":5000, + "unlist":True, + "lux":0.4, + }, + "mforest":{ + "key":"jayson_undergroundjungle", + "name":"Mystical Forest", + "npcs":[ + ], + "monsters":[ + {"type":"bluefairy","boundary":[-292,-498,-168,-366],"count":1}, + {"type":"greenfairy","boundary":[-432,317,-342,450],"count":1}, + {"type":"redfairy","boundary":[313,590,393,848],"count":1}, + # {"type":"TBD","boundary":[282,-502,524,-192],"count":6,"grow":True}, #dryad? + # {"type":"TBD","boundary":[250,228,614,442],"count":6,"grow":True}, #ogre? + # {"type":"TBD","boundary":[-99,534,132,856],"count":6,"grow":True}, #dino? + ], + "spawns":[ + [0,0], + ], + "doors":[ + [1,-32,40,49,"halloween",5,0], #door to Halloween + ], + "quirks":[ + ], + "drop_norm":5000, + "unlist":True, + "lux":0.4, + }, + "spider_instance":{ + "key":"jayson_pvpDungeon_b1", + "name":"The Spider Den", + "npcs":[ + ], + "monsters":[ + # {"type":"spiderqueen","boundary":[2243.92,325.27,2689.64,505.06],"count":1}, + # {"type":"spider","boundary":[2243.92,325.27,2689.64,505.06],"count":1}, + ], + "spawns":[ + [0,10], + # [193,-1619], + # [-193,-1619], + ], + "on_death":["gateway",3], + "on_exit":["gateway",3], + "doors":[ + [0,84,67,63,"gateway",3,0], + # [190,-1628,60,85,"gateway",3,0], + # [-190,-1628,60,85,"gateway",3,0], + ], + "instance":True, + }, } for name in maps: From d6335c954e805b23734bbb591fb9bb5bbb32c6bd Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Fri, 24 Jan 2025 20:34:55 -0700 Subject: [PATCH 02/46] new/changes sprites Added the sprite for 2 new items sprite recolor for 3 items to provide differentiation --- images/tiles/items/community.png | Bin 820 -> 2953 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/tiles/items/community.png b/images/tiles/items/community.png index 58e0e6544b0ae52bf9dd3322e44748696e85d4af..49c1c388564dcc931ab17792d2ca38312d0939da 100644 GIT binary patch literal 2953 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 literal 820 zcmeAS@N?(olHy`uVBq!ia0y~yVCZ3BVA#UJ#=yYf_VUO-1_lPk;vjb?hIQv;UNSH+ zz4LT&45^s&_NINtoKzY15AU^AUnyK#rE8Mm@#0cR!BzpIj%M$dYsF167dAV;kkMP5 zB3!tt+nf1hfPhnb(!vzO5|Qp>C0>6nYgl-&{cnhfYk$_~U9@w~&dqz9&$IKrt9@5l z|Gx12^yiiLz6<@}?^4k`UF84x%9W7CiPhEC!otFyleTW%%EQlZ{!3S1U%c1JwQzx- z`PWybFZI=D@jrY1{PdFt2V|Gst4~Z^nEF5N`eOensWYS2hD}SI`FKy()~Lw!m+xHj z-FrAq`gv(^^4}GQ zB=kkUkNmGEbLGYtJv}`$wv4K(T^^IJ_NRTm8NPq&;>C+SC&`;_|8#Hm^6v8IcAk@L zpPxB%M&#^ikJVKtC-WBUy?5=}wRwNf{wvO@`t5&u_mVX8yqdVaJ^yOj+S)#yUaxNS z_up+@_lHrfejosMg5HQ# Date: Fri, 24 Jan 2025 20:42:52 -0700 Subject: [PATCH 03/46] Delete images/tiles/items/community.png --- images/tiles/items/community.png | Bin 2953 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 images/tiles/items/community.png diff --git a/images/tiles/items/community.png b/images/tiles/items/community.png deleted file mode 100644 index 49c1c388564dcc931ab17792d2ca38312d0939da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2953 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 From 1e88329465044fe1b156b4d572fdecd2d79beefe Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Fri, 24 Jan 2025 20:45:27 -0700 Subject: [PATCH 04/46] new sprites added 2 new item sprites added 3 sprite recolors for differentiation --- images/tiles/items/community.png | Bin 0 -> 2953 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 images/tiles/items/community.png diff --git a/images/tiles/items/community.png b/images/tiles/items/community.png new file mode 100644 index 0000000000000000000000000000000000000000..49c1c388564dcc931ab17792d2ca38312d0939da GIT binary patch literal 2953 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 literal 0 HcmV?d00001 From ff2bcccc3826190a669bdea9c5c4c263341eeae8 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Fri, 24 Jan 2025 20:50:02 -0700 Subject: [PATCH 05/46] New Sprite linking new sprite for: - feather1 - harpybow - zapper new item sprite for - alloyquiver - sparkstaff --- design/dimensions.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/design/dimensions.py b/design/dimensions.py index 8bca08e..8294e83 100644 --- a/design/dimensions.py +++ b/design/dimensions.py @@ -519,6 +519,7 @@ positions={ "emotionjar":["custom",5,1], "bottleofxp":["",15,35], "feather0":["",1,33], + "feather1":["community",5,0], "bronzeingot":["",2,35], "goldingot":["",3,35], "platinumingot":["",4,35], @@ -701,6 +702,7 @@ positions={ "sshield":["",1,12], #Spiked "quiver":["",0,13], "t2quiver":["",1,13], + "alloyquiver":["community",2,0], "wbook0":["",1,14], "wbook1":["",3,14], "cupid":["",14,29], @@ -930,6 +932,7 @@ positions={ "wand":["",14,58], "crossbow":["",6,9], "t3bow":["",5,9], + "harpybow":["community",4,0], "bow4":["",10,9], "axe3":["",11,10], "xshot":["",1,22], @@ -965,11 +968,13 @@ positions={ "essenceofgreed":["",13,34], "weaver":["",13,9], "blaster":["",0,10], + "sparkstaff":["community",3,0], "pouchbow":["",5,59], "elixirfires":["",5,62], "elixirfzres":["",6,62], "elixirpnres":["",4,62], "trigger":["",15,16], + "zapper":["community",6,0], "mbelt":["",4,3], "bfangamulet":["community",1,0], @@ -1002,4 +1007,4 @@ positions={ #"claw":["",13,42], "friendtoken":["",15,33], -} \ No newline at end of file +} From f7b6a81cbc2d50c9e512a50dc229386b87819ebd Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Fri, 24 Jan 2025 20:52:22 -0700 Subject: [PATCH 06/46] Added new mob drop tables Sparkbot & targetron --- design/drops.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/design/drops.py b/design/drops.py index 0243916..21269ac 100644 --- a/design/drops.py +++ b/design/drops.py @@ -499,6 +499,24 @@ drops={ [1.0/500,"starkillers"], [1.0/100,"sbelt"], ], + "sparkbot":[ + [1.0/8000,"sparkstaff"], + [1.0/200000,"platinumingot"], + [1.0/25000,"platinumnugget"], + [1.0/9000,"goldingot"], + [1.0/1000,"goldnugget"], + [1.0/4000,"bronzeingot"], + [1.0/400,"bronzenugget"], + ], + "targetron":[ + [1.0/4000,"alloyquiver"], + [1.0/200000,"platinumingot"], + [1.0/25000,"platinumnugget"], + [1.0/9000,"goldingot"], + [1.0/1000,"goldnugget"], + [1.0/4000,"bronzeingot"], + [1.0/400,"bronzenugget"], + ], }, "konami":[ [6.0/10000000,"powerglove"], From 32fb929e5be2024b96ac9247282aecc4e978e756 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Fri, 24 Jan 2025 20:54:51 -0700 Subject: [PATCH 07/46] New items Added the sparkstaff and alloyquiver items --- design/items.py | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/design/items.py b/design/items.py index 5c2cf60..3b46708 100644 --- a/design/items.py +++ b/design/items.py @@ -3592,6 +3592,22 @@ weapons={ "g":1240000, "cx":{"accent":"#AF2131"}, }, + "sparkstaff":{ + "type":"weapon", + "wtype":"great_staff", + "projectile":"magic", + "tier":2.5, + "blast":30, + "skin":"sparkstaff", + "damage_type":"magical", + "upgrade":{ + "blast":5, + }, + "name":"Spark Staff", + "g":224000, + "grades":[0,5], + "cx":{"accent":"#201DAD"}, + }, "staff2":{ "type":"weapon", "wtype":"staff", @@ -4198,6 +4214,27 @@ offhands={ "grades":[0,4], "a":True, }, + "alloyquiver":{ + "type":"quiver", + "tier":2, + "skin":"alloyquiver", + "dex":2, + "explosion":2, + "range":20, + "armor":15, + "resistance":12, + "upgrade":{ + "explosion":1.5, + "dex":1.25, + "armor":3.5, + "resistance":3, + "range":3.5, + }, + "name":"Alloy Quiver", + "g":112000, + "grades":[0,5], + "a":True, + }, } collectables={ From 734b7a9746bf3db3cf61f48bb549bd81e3e71042 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Fri, 24 Jan 2025 20:56:45 -0700 Subject: [PATCH 08/46] Added Mob spawn location Added Sparkbot and Targetron spawn location --- design/maps.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/design/maps.py b/design/maps.py index 519b628..b525500 100644 --- a/design/maps.py +++ b/design/maps.py @@ -1696,8 +1696,8 @@ maps={ "npcs":[ ], "monsters":[ - # {"type":"Robot1","boundary":[-734,-394,-416,-157],"count":6,"grow":True}, - # {"type":"Robot2","boundary":[-672,-394,-416,-120],"count":6,"grow":True}, + {"type":"sparkbot","boundary":[-734,-394,-416,-157],"count":6,"grow":True}, + {"type":"targetron","boundary":[-672,-394,-416,-120],"count":6,"grow":True}, # {"type":"TBD","boundary":[194,-550,648,-407],"count":6,"grow":True}, # {"type":"TBD","boundary":[-431,-646,-242,-528],"count":6,"grow":True}, ], From bb0b64d96cdb20370bcdcda30e6ebab691d63222 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Fri, 24 Jan 2025 20:58:47 -0700 Subject: [PATCH 09/46] 2 new monsters created the stats and achievements for Sparkbot and Targetron --- design/monsters.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/design/monsters.py b/design/monsters.py index a176a87..cd4d3bb 100644 --- a/design/monsters.py +++ b/design/monsters.py @@ -875,6 +875,30 @@ monsters={ [10000000,"stat","speed",2], ] }, + "sparkbot":{ + "name":"Spark Bot","speed":20,"charge":75,"hp":325000,"xp":400000,"attack":754,"damage_type":"magical","respawn":6,"gold":1,"range":185,"frequency":1.56,"aggro":0.1,"reflection":8,"armor":140,"resistance":160, + "achievements":[ + [1,"stat","hp",10], + [100,"stat","mp",25], + [1000,"stat","rpiercing",5], + [10000,"stat","int",1], + [100000,"stat","resistance",15], + [1000000,"stat","attack",10], + [10000000,"stat","reflection",1], + ] + }, + "targetron":{ + "name":"Targetron","speed":20,"charge":60,"hp":325000,"xp":400000,"attack":377,"damage_type":"physical","respawn":6,"gold":15,"range":200,"frequency":3.12,"aggro":0.1,"dreturn":2,"armor":160,"resistance":140,"explosion":15, + "achievements":[ + [1,"stat","mp",10], + [100,"stat","hp",25], + [1000,"stat","dex",1], + [10000,"stat","range",0.5], + [100000,"stat","armor",15], + [1000000,"stat","attack",10], + [10000000,"stat","evasion",1.25], + ] + }, "welemental":{"name":"Water Elemental","speed":20,"hp":80000,"xp":10,"attack":1800,"damage_type":"physical","respawn":1,"gold":1,"range":80,"frequency":1.2,"aggro":0.2,"evasion":80}, "felemental":{"name":"Fire Elemental","speed":20,"hp":80000,"xp":10,"attack":1800,"damage_type":"physical","respawn":1,"gold":1,"range":80,"frequency":1.2,"aggro":0.2,"evasion":80}, "nelemental":{"name":"Nature Elemental","speed":20,"hp":80000,"xp":10,"attack":1800,"damage_type":"physical","respawn":1,"gold":1,"range":80,"frequency":1.2,"aggro":0.2,"evasion":80}, From 0d743de84e37a966275530fb6a91941ef96107b5 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Fri, 24 Jan 2025 21:00:17 -0700 Subject: [PATCH 10/46] linked new mob sprite sheet added the robots sprite sheet --- design/sprites.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/design/sprites.py b/design/sprites.py index 76fe2c5..40973e8 100644 --- a/design/sprites.py +++ b/design/sprites.py @@ -953,6 +953,15 @@ sprites={ ["mrgreen"], ] }, + "robots1":{ + "file":"/images/tiles/monsters/robots_walkin_B_1.png", + "rows":2, + "columns":4, + "matrix":[ + [None,"sparkbot","targetron",None], + [None,None,None,None] #"trapchest1","trapchest2" + ] + }, "emblems":{ "file":"/images/sprites/emblems/emblems.png?v=6", "type":"emblem", @@ -1143,4 +1152,4 @@ tilesets={ "ruins":{"file":"/images/tiles/map/ruins.png?v=2"}, "tree":{"file":"/images/tiles/map/tree.png"}, "lights":{"file":"/images/tiles/map/lights.png?v=3","light":"yes"}, # "frames":3,"frame_width":48, -} \ No newline at end of file +} From 096b5c0f3830a57fa277bef87fc5686fde289977 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Fri, 24 Jan 2025 23:27:30 -0700 Subject: [PATCH 11/46] New mob sprite sheets sprite sheets for Dryad and Dino's --- design/sprites.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/design/sprites.py b/design/sprites.py index 40973e8..57742cf 100644 --- a/design/sprites.py +++ b/design/sprites.py @@ -959,7 +959,24 @@ sprites={ "columns":4, "matrix":[ [None,"sparkbot","targetron",None], - [None,None,None,None] #"trapchest1","trapchest2" + [None,None,None,None] + ] + }, + "dryad":{ + "file":"/images/tiles/monsters/dryad_green_1.png", + "rows":1, + "columns":1, + "matrix":[ + ["dryad"], + ] + }, + "dinos":{ + "file":"/images/tiles/monsters/mondinos_1.png", + "rows":2, + "columns":4, + "matrix":[ + ["gdino","odino","bdino","wdino"], + [None,None,None,None] ] }, "emblems":{ From 0538b4e872cfa0da4cb5fa3ea8187f2c8ea7077f Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Fri, 24 Jan 2025 23:39:07 -0700 Subject: [PATCH 12/46] Added Mob spawn locations Added mobs to Mystical Forest - Dryad - Orange Dino's --- design/maps.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/design/maps.py b/design/maps.py index b525500..56a7216 100644 --- a/design/maps.py +++ b/design/maps.py @@ -1679,10 +1679,12 @@ maps={ "spawns":[ [0,0], [256,-905], # Gateway door + [-513,-697], # unused door spawn ], "doors":[ - #[0,80,54,67,"TBD",0,0], #door to (To Be Determined) + # [0,80,54,67,"TBD",0,0], #door to (To Be Determined) [255,-917,62,99,"gateway",1,1], #door to Gateway + # [-513,-626,49,62,"gateway",1,1], #door to (To Be Determined) ], "quirks":[ ], @@ -1726,9 +1728,9 @@ maps={ {"type":"bluefairy","boundary":[-292,-498,-168,-366],"count":1}, {"type":"greenfairy","boundary":[-432,317,-342,450],"count":1}, {"type":"redfairy","boundary":[313,590,393,848],"count":1}, - # {"type":"TBD","boundary":[282,-502,524,-192],"count":6,"grow":True}, #dryad? - # {"type":"TBD","boundary":[250,228,614,442],"count":6,"grow":True}, #ogre? - # {"type":"TBD","boundary":[-99,534,132,856],"count":6,"grow":True}, #dino? + {"type":"dryad","boundary":[282,-502,524,-192],"count":6,"grow":True}, + # {"type":"TBD","boundary":[250,228,614,442],"count":6,"grow":True}, #ogre? orc? (to be determined) + {"type":"odino","boundary":[-99,534,132,856],"count":7,"grow":True}, ], "spawns":[ [0,0], @@ -1740,7 +1742,7 @@ maps={ ], "drop_norm":5000, "unlist":True, - "lux":0.4, + "lux":0.6, }, "spider_instance":{ "key":"jayson_pvpDungeon_b1", From d2df28bec3c43b7d36e25428f8117ac8fa42c0cf Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sat, 25 Jan 2025 00:15:34 -0700 Subject: [PATCH 13/46] Added New Mobs Added Dryad full stats and achievements Added Dino full stats and achievements --- design/monsters.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/design/monsters.py b/design/monsters.py index cd4d3bb..89937c1 100644 --- a/design/monsters.py +++ b/design/monsters.py @@ -899,6 +899,34 @@ monsters={ [10000000,"stat","evasion",1.25], ] }, + "dryad":{ + "name":"Dryad","speed":24,"charge":48,"hp":80000,"xp":60000,"attack":400,"damage_type":"magical","respawn":2,"gold":1,"range":160,"frequency":1,"aggro":0.1,"armor":65,"resistance":100, + "abilities":{ + "mtangle":{"cooldown":5000} + }, + "achievements":[ + [1,"stat","mp",20], + [100,"stat","vit",1], + [1000,"stat","int",1], + [10000,"stat","pnresistance",1], + [100000,"stat","evasion",15], + [1000000,"stat","reflection",0.5], + [10000000,"stat","frequency",1], + ] + }, + "odino":{ + "name":"Dino","speed":28,"charge":52,"hp":165000,"xp":140000,"attack":550,"damage_type":"physical","respawn":3,"gold":1,"range":50,"frequency":1.2,"aggro":0.2,"armor":135,"resistance":65,"apiercing":100, + "crit":12, + "achievements":[ + [1,"stat","hp",10], + [100,"stat","speed",1], + [1000,"stat","attack",5], + [10000,"stat","pnresistance",5], + [100000,"stat","pnresistance",1], + [1000000,"stat","apiercing",10], + [10000000,"stat","crit",0.5], + ] + }, "welemental":{"name":"Water Elemental","speed":20,"hp":80000,"xp":10,"attack":1800,"damage_type":"physical","respawn":1,"gold":1,"range":80,"frequency":1.2,"aggro":0.2,"evasion":80}, "felemental":{"name":"Fire Elemental","speed":20,"hp":80000,"xp":10,"attack":1800,"damage_type":"physical","respawn":1,"gold":1,"range":80,"frequency":1.2,"aggro":0.2,"evasion":80}, "nelemental":{"name":"Nature Elemental","speed":20,"hp":80000,"xp":10,"attack":1800,"damage_type":"physical","respawn":1,"gold":1,"range":80,"frequency":1.2,"aggro":0.2,"evasion":80}, From be38357e406125a617e58b6e88e259de643b7bb5 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sat, 25 Jan 2025 00:40:02 -0700 Subject: [PATCH 14/46] Added more mob drop tables --- design/drops.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/design/drops.py b/design/drops.py index 21269ac..ed72e84 100644 --- a/design/drops.py +++ b/design/drops.py @@ -517,6 +517,33 @@ drops={ [1.0/4000,"bronzeingot"], [1.0/400,"bronzenugget"], ], + "dryad":[ + [1.0/5000,"pclaw"], + [1.0/500,"essenceofnature"], + [1.0/550,"gem0"], + [1.0/25000,"elixirpnres"], + ], + "odino":[ + [1.0/400,"mbones"], + [1.0/10000,"sshield"], + [1.0/50000,"tombkey"], + ], + "ggreenpro":[ + [1.0/25,"spikedhelm"], + [1.0/20000,"tombkey"], + ], + "gredpro":[ + [1.0/25,"spikedhelm"], + [1.0/20000,"tombkey"], + ], + "gbluepro":[ + [1.0/25,"spikedhelm"], + [1.0/20000,"tombkey"], + ], + "gpurplepro":[ + [1.0/25,"spikedhelm"], + [1.0/20000,"tombkey"], + ], }, "konami":[ [6.0/10000000,"powerglove"], From 95191ad683fe6426f23de277baf45bce9266452d Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sat, 25 Jan 2025 00:46:49 -0700 Subject: [PATCH 15/46] Added more mob drop tables - Added Dryad drop table - Added oDino drop table - Added all 4 gProtectors drop tables - Tombkeys are now acquirable - 2 new items dropped: pclaw & spikedhelm --- design/drops.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/design/drops.py b/design/drops.py index ed72e84..5a39f9a 100644 --- a/design/drops.py +++ b/design/drops.py @@ -530,19 +530,19 @@ drops={ ], "ggreenpro":[ [1.0/25,"spikedhelm"], - [1.0/20000,"tombkey"], + [1.0/10000,"tombkey"], ], "gredpro":[ [1.0/25,"spikedhelm"], - [1.0/20000,"tombkey"], + [1.0/10000,"tombkey"], ], "gbluepro":[ [1.0/25,"spikedhelm"], - [1.0/20000,"tombkey"], + [1.0/10000,"tombkey"], ], "gpurplepro":[ [1.0/25,"spikedhelm"], - [1.0/20000,"tombkey"], + [1.0/10000,"tombkey"], ], }, "konami":[ From bdc5627d11762046b6daaa0b78edadac3aecd9e0 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sat, 25 Jan 2025 00:56:50 -0700 Subject: [PATCH 16/46] Added more mob drop tables Added more mob drop tables - Added Dryad drop table - Added oDino drop table - Added all 4 gProtectors drop tables - Tombkeys are now acquirable - 2 new items dropped: pclaw & spikedhelmet --- design/drops.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/design/drops.py b/design/drops.py index 5a39f9a..2f95b2d 100644 --- a/design/drops.py +++ b/design/drops.py @@ -529,19 +529,19 @@ drops={ [1.0/50000,"tombkey"], ], "ggreenpro":[ - [1.0/25,"spikedhelm"], + [1.0/25,"spikedhelmet"], [1.0/10000,"tombkey"], ], "gredpro":[ - [1.0/25,"spikedhelm"], + [1.0/25,"spikedhelmet"], [1.0/10000,"tombkey"], ], "gbluepro":[ - [1.0/25,"spikedhelm"], + [1.0/25,"spikedhelmet"], [1.0/10000,"tombkey"], ], "gpurplepro":[ - [1.0/25,"spikedhelm"], + [1.0/25,"spikedhelmet"], [1.0/10000,"tombkey"], ], }, From 3a6a09e096a9446d25ef1487c326010b28124418 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sat, 25 Jan 2025 09:39:19 -0700 Subject: [PATCH 17/46] New and improved items added 2 new items - Poison Claw (pclaw) - Spiked Helmet (spikedhelmet) Changed the skin for 3 items - zapper - feather1 - harpybow --- design/items.py | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/design/items.py b/design/items.py index 3b46708..4ea20ff 100644 --- a/design/items.py +++ b/design/items.py @@ -543,6 +543,21 @@ armor={ "g":3200000, "a":2, }, + "spikedhelmet":{ + "tier":4, + "type":"helmet", + "skin":"spikedhelmet", + "dreturn":3, + "scroll":True, + "upgrade":{ + "armor":12, + "dreturn":1, + "resistance":-7 + }, + "name":"Spiked Helmet", + "g":3200000, + "a":2, + }, "luckyt":{ #"set":"base", "type":"chest", @@ -1916,7 +1931,7 @@ accessories={ }, "zapper":{ "type":"ring", - "skin":"trigger", + "skin":"zapper", "rpiercing":10, "int":10, "str":5, @@ -2672,6 +2687,22 @@ weapons={ "a":True, "grades":[0,7], }, + "pclaw":{ + "type":"weapon", + "wtype":"fist", + "tier":2, + "skin":"pclaw", + "damage_type":"physical", + "ability":"poison", + "attr0":1.5, + "upgrade":{ + "attr0":0.5, + }, + "name":"Poison Claw", + "g":72000, + "a":True, + "grades":[0,7], + }, "stinger":{ "type":"weapon", "wtype":"dagger", @@ -2969,7 +3000,7 @@ weapons={ "tier":3, "speed":2, "evasion":5, - "skin":"t3bow", + "skin":"harpybow", "damage_type":"physical", "upgrade":{ }, @@ -6730,7 +6761,7 @@ crafting_items={ "feather1":{ "type":"material", "name":"Harpy Feather", - "skin":"feather0", + "skin":"feather1", "explanation":"Holding this, you understand how those huge harpies can fly, it's not a normal feather!", "s":True, "g":800, From 052b344c45cabc65064b510f556d2a842cee02ad Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sat, 25 Jan 2025 09:50:36 -0700 Subject: [PATCH 18/46] New items added 2 new items - pclaw - spikedhelm fixed spacing on a items i previously introduced --- design/dimensions.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/design/dimensions.py b/design/dimensions.py index 8294e83..6242556 100644 --- a/design/dimensions.py +++ b/design/dimensions.py @@ -203,7 +203,8 @@ positions={ #"hhelmet":["pack_1a",9,23], #t3 "hhelmet":["",4,0], #"xhelmet":["pack_1a",13,23], #t4 - "xhelmet":["",5,0], + "xhelmet":["",12,0], + "spikedhelmet":["",5,0], #"phelmet":["pack_1a",5,116], #pumpkin "phelmet":["",11,29], #"coat":["pack_1a",8,3], #t1 @@ -519,7 +520,7 @@ positions={ "emotionjar":["custom",5,1], "bottleofxp":["",15,35], "feather0":["",1,33], - "feather1":["community",5,0], + "feather1":["community",5,0], "bronzeingot":["",2,35], "goldingot":["",3,35], "platinumingot":["",4,35], @@ -692,6 +693,7 @@ positions={ "claw":["",1,11], "fclaw":["",3,11], "fclaw_r":["",8,58], + "pclaw":["",7,11], "froststaff":["",8,10], "froststaff_r":["",4,58], "throwingstars":["",4,9], @@ -702,7 +704,7 @@ positions={ "sshield":["",1,12], #Spiked "quiver":["",0,13], "t2quiver":["",1,13], - "alloyquiver":["community",2,0], + "alloyquiver":["community",2,0], "wbook0":["",1,14], "wbook1":["",3,14], "cupid":["",14,29], @@ -932,7 +934,7 @@ positions={ "wand":["",14,58], "crossbow":["",6,9], "t3bow":["",5,9], - "harpybow":["community",4,0], + "harpybow":["community",4,0], "bow4":["",10,9], "axe3":["",11,10], "xshot":["",1,22], @@ -968,13 +970,13 @@ positions={ "essenceofgreed":["",13,34], "weaver":["",13,9], "blaster":["",0,10], - "sparkstaff":["community",3,0], + "sparkstaff":["community",3,0], "pouchbow":["",5,59], "elixirfires":["",5,62], "elixirfzres":["",6,62], "elixirpnres":["",4,62], "trigger":["",15,16], - "zapper":["community",6,0], + "zapper":["community",6,0], "mbelt":["",4,3], "bfangamulet":["community",1,0], From 43be11b187e904e38fe139559c3625a78fd6b213 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sat, 25 Jan 2025 09:59:35 -0700 Subject: [PATCH 19/46] fixed map naming fixed the instances of Mystical Forest (mforest) being labeled as jungle --- design/maps.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/design/maps.py b/design/maps.py index 56a7216..3b4f018 100644 --- a/design/maps.py +++ b/design/maps.py @@ -1310,14 +1310,14 @@ maps={ [784,-1060], #2-spooky [-1071,-1485], #3-level1 [1212,101,3], #4-main - [-560,-990], #5-jungle + [-560,-990], #5-mforest ], "doors":[ #[108,-260,32,32,"spookytown",1,2], [784,-1085,80,40,"spookytown",1,2], [-1071,-1496,40,40,"level1",2,3], [1212,150,200,36,"main",15,4], - [-560,-1008,28,32,"jungle",0,0], + [-560,-1008,28,32,"mforest",0,0], ], "quirks":[ [-228,-178,32,40,"log","Locked but there are noises coming from inside"], From 122475d1f87c11745b86c4549a28d44afed99a68 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sat, 25 Jan 2025 10:01:57 -0700 Subject: [PATCH 20/46] Fixed my mistake accidentally changed xhelmet when adding spikedhelmet and swapped their sprites. should be fixed now --- design/dimensions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/design/dimensions.py b/design/dimensions.py index 6242556..6f8f025 100644 --- a/design/dimensions.py +++ b/design/dimensions.py @@ -203,8 +203,8 @@ positions={ #"hhelmet":["pack_1a",9,23], #t3 "hhelmet":["",4,0], #"xhelmet":["pack_1a",13,23], #t4 - "xhelmet":["",12,0], - "spikedhelmet":["",5,0], + "xhelmet":["",5,0], + "spikedhelmet":["",12,0], #"phelmet":["pack_1a",5,116], #pumpkin "phelmet":["",11,29], #"coat":["pack_1a",8,3], #t1 From 87b9f5d183bba0762f9abcdfb3eea9c8b044296b Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sat, 25 Jan 2025 10:10:01 -0700 Subject: [PATCH 21/46] Removed duplicate maps found that 2 maps already existed removed them since they have no npc's or monsters --- design/maps.py | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/design/maps.py b/design/maps.py index 3b4f018..a627d13 100644 --- a/design/maps.py +++ b/design/maps.py @@ -448,42 +448,6 @@ maps={ {"type":"debuff","polygon":[[-336,-1136],[-192,-1136],[-192,-1160],[-168,-1160],[-168,-1152],[-120,-1152],[-120,-1168],[-112,-1168],[-112,-1240],[-72,-1240],[-72,-1256],[-56,-1256],[-56,-1288],[0,-1288],[0,-1272],[16,-1272],[16,-1208],[88,-1208],[88,-1088],[200,-1088],[200,-1128],[336,-1128],[336,-1368],[240,-1368],[240,-1336],[216,-1336],[216,-1320],[160,-1320],[160,-1400],[128,-1400],[128,-1448],[144,-1448],[144,-1512],[88,-1512],[88,-1496],[64,-1496],[64,-1440],[40,-1440],[40,-1432],[0,-1432],[0,-1464],[-40,-1464],[-40,-1480],[-64,-1480],[-64,-1512],[-144,-1512],[-144,-1560],[-176,-1560],[-176,-1576],[-216,-1576],[-216,-1544],[-264,-1544],[-264,-1480],[-288,-1480],[-288,-1456],[-296,-1456],[-296,-1432],[-328,-1432],[-328,-1152],[-336,-1152]]}, ] }, - "d_a1":{ - "key":"jayson_pvpDungeon_a1", - "name":"Dungeon", - "npcs":[ - ], - "monsters":[ - ], - "spawns":[ - [-2.2,1.48,3], - [255.6,-905.1], - ], - "doors":[ - [0.21,79.75,54.39,66.5,"d_b1",1,0], - [254.82,-916.88,61.73,99.0,"d_a2",0,1], - ], - "quirks":[ - ], - "world":"dungeon", - }, - "d_a2":{ - "key":"jayson_pvpDungeon_a2", - "name":"Dungeon", - "npcs":[ - ], - "monsters":[ - ], - "spawns":[ - [-2.12,-0.39,3] - ], - "doors":[ - [0.6,77.16,56.2,64.21,"d_a1",1,0], - ], - "quirks":[ - ], - "world":"dungeon", - }, "cave":{ "key":"jayson_cave02", "name":"Cave of Darkness", From 6cb8f67e5b6fc83846e0d7dff3021eb0d0e1ccdd Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sat, 25 Jan 2025 10:21:31 -0700 Subject: [PATCH 22/46] Another duplicate map deleted d_b1 in replace of my version --- design/maps.py | 50 ++++++-------------------------------------------- 1 file changed, 6 insertions(+), 44 deletions(-) diff --git a/design/maps.py b/design/maps.py index a627d13..5b2db88 100644 --- a/design/maps.py +++ b/design/maps.py @@ -404,50 +404,6 @@ maps={ ], "world":"dungeon", }, - "d_g":{ - "key":"jayson_pvpDungeon_gateway", - "name":"Dungeon [Gateway]", - "npcs":[ - ], - "monsters":[ - #{"type":"bat","boundary":[-120,-207,108,17],"count":6}, - ], - "spawns":[ - [0.03,1.13,3], - [-319.17,-102.09,3], - ], - "doors":[ - [0.14,47.88,46.19,36.62,"d_e",1,0], - [-320.6,-39.93,64.22,59.29,"d_b1",0,1], - ], - "quirks":[ - [-320.64,-213.45,67.59,82.61,"log","The passage is blocked"], - ], - "world":"dungeon", - }, - "d_b1":{ - "key":"jayson_pvpDungeon_b1", - "name":"Dungeon", - "npcs":[ - ], - "monsters":[ - ], - "spawns":[ - [-0.28,10.19,3], - [-192.16,-1655.63], - ], - "doors":[ - [0.09,83.59,66.6,63.26,"d_g",1,0], - [-192.9,-1666.24,59.7,45.23,"d_a1",0,1], - ], - "quirks":[ - [190.54,-1628.83,59.88,85.03,"log","The passage is blocked"], - ], - "world":"dungeon", - "traps":[ - {"type":"debuff","polygon":[[-336,-1136],[-192,-1136],[-192,-1160],[-168,-1160],[-168,-1152],[-120,-1152],[-120,-1168],[-112,-1168],[-112,-1240],[-72,-1240],[-72,-1256],[-56,-1256],[-56,-1288],[0,-1288],[0,-1272],[16,-1272],[16,-1208],[88,-1208],[88,-1088],[200,-1088],[200,-1128],[336,-1128],[336,-1368],[240,-1368],[240,-1336],[216,-1336],[216,-1320],[160,-1320],[160,-1400],[128,-1400],[128,-1448],[144,-1448],[144,-1512],[88,-1512],[88,-1496],[64,-1496],[64,-1440],[40,-1440],[40,-1432],[0,-1432],[0,-1464],[-40,-1464],[-40,-1480],[-64,-1480],[-64,-1512],[-144,-1512],[-144,-1560],[-176,-1560],[-176,-1576],[-216,-1576],[-216,-1544],[-264,-1544],[-264,-1480],[-288,-1480],[-288,-1456],[-296,-1456],[-296,-1432],[-328,-1432],[-328,-1152],[-336,-1152]]}, - ] - }, "cave":{ "key":"jayson_cave02", "name":"Cave of Darkness", @@ -1729,6 +1685,12 @@ maps={ # [190,-1628,60,85,"gateway",3,0], # [-190,-1628,60,85,"gateway",3,0], ], + "quirks":[ + [190,-1628,60,85,"log","The passage is blocked"], + ], + "traps":[ + {"type":"debuff","polygon":[[-336,-1136],[-192,-1136],[-192,-1160],[-168,-1160],[-168,-1152],[-120,-1152],[-120,-1168],[-112,-1168],[-112,-1240],[-72,-1240],[-72,-1256],[-56,-1256],[-56,-1288],[0,-1288],[0,-1272],[16,-1272],[16,-1208],[88,-1208],[88,-1088],[200,-1088],[200,-1128],[336,-1128],[336,-1368],[240,-1368],[240,-1336],[216,-1336],[216,-1320],[160,-1320],[160,-1400],[128,-1400],[128,-1448],[144,-1448],[144,-1512],[88,-1512],[88,-1496],[64,-1496],[64,-1440],[40,-1440],[40,-1432],[0,-1432],[0,-1464],[-40,-1464],[-40,-1480],[-64,-1480],[-64,-1512],[-144,-1512],[-144,-1560],[-176,-1560],[-176,-1576],[-216,-1576],[-216,-1544],[-264,-1544],[-264,-1480],[-288,-1480],[-288,-1456],[-296,-1456],[-296,-1432],[-328,-1432],[-328,-1152],[-336,-1152]]}, + ], "instance":True, }, From 514412e7bf7cd2159bacd6f857e9219c65367fc9 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sat, 25 Jan 2025 10:54:30 -0700 Subject: [PATCH 23/46] Fixed an items stats Fixed Spiked Helmet apparently the way i had it before wasnt gonna work. it will just be overridden my the upgrade formula Aria helped me figured out another way to work around it --- design/items.py | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/design/items.py b/design/items.py index 4ea20ff..4839734 100644 --- a/design/items.py +++ b/design/items.py @@ -544,20 +544,23 @@ armor={ "a":2, }, "spikedhelmet":{ - "tier":4, - "type":"helmet", - "skin":"spikedhelmet", - "dreturn":3, - "scroll":True, - "upgrade":{ - "armor":12, - "dreturn":1, - "resistance":-7 - }, - "name":"Spiked Helmet", - "g":3200000, - "a":2, - }, + "tier":0, + "type":"helmet", + "skin":"spikedhelmet", + "armor":35, + "dreturn":2, + "stat":4, + "scroll":True, + "upgrade":{ + "armor":7.75, + "dreturn":1, + "stat":1, + }, + "grades":[0,0,8,10], + "name":"Spiked Helmet", + "g":3200000, + "a":2, + }, "luckyt":{ #"set":"base", "type":"chest", From a7b0c3cccd90a2bc04839ef476b565d81ed00c16 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sat, 25 Jan 2025 10:57:12 -0700 Subject: [PATCH 24/46] Fixed spacing issue made an error with spacing when fixing spikedhelmet values --- design/items.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/design/items.py b/design/items.py index 4839734..5a65e68 100644 --- a/design/items.py +++ b/design/items.py @@ -544,23 +544,23 @@ armor={ "a":2, }, "spikedhelmet":{ - "tier":0, - "type":"helmet", - "skin":"spikedhelmet", - "armor":35, - "dreturn":2, - "stat":4, - "scroll":True, - "upgrade":{ - "armor":7.75, - "dreturn":1, - "stat":1, - }, - "grades":[0,0,8,10], - "name":"Spiked Helmet", - "g":3200000, - "a":2, - }, + "tier":0, + "type":"helmet", + "skin":"spikedhelmet", + "armor":35, + "dreturn":2, + "stat":4, + "scroll":True, + "upgrade":{ + "armor":7.75, + "dreturn":1, + "stat":1, + }, + "grades":[0,0,8,10], + "name":"Spiked Helmet", + "g":3200000, + "a":2, + }, "luckyt":{ #"set":"base", "type":"chest", From 48142353de4a8e7edbc0846614b4a5bb2b4242fe Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sat, 25 Jan 2025 11:41:33 -0700 Subject: [PATCH 25/46] Edit to Poison Claw increased weapon tier temporarily removed poison ability --- design/items.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/design/items.py b/design/items.py index 5a65e68..8125c8a 100644 --- a/design/items.py +++ b/design/items.py @@ -2693,13 +2693,13 @@ weapons={ "pclaw":{ "type":"weapon", "wtype":"fist", - "tier":2, + "tier":2.4, "skin":"pclaw", "damage_type":"physical", - "ability":"poison", - "attr0":1.5, + #"ability":"poison", + #"attr0":1.5, "upgrade":{ - "attr0":0.5, + #"attr0":0.5, }, "name":"Poison Claw", "g":72000, From 1ef00da8da7c47440a73e4898f8fb3da236353c1 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sat, 25 Jan 2025 11:43:58 -0700 Subject: [PATCH 26/46] Reduced mob count reduced the amount of sparkbot and targetron that spawn --- design/maps.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/design/maps.py b/design/maps.py index 5b2db88..7550c61 100644 --- a/design/maps.py +++ b/design/maps.py @@ -1618,8 +1618,8 @@ maps={ "npcs":[ ], "monsters":[ - {"type":"sparkbot","boundary":[-734,-394,-416,-157],"count":6,"grow":True}, - {"type":"targetron","boundary":[-672,-394,-416,-120],"count":6,"grow":True}, + {"type":"sparkbot","boundary":[-734,-394,-416,-157],"count":4,"grow":True}, + {"type":"targetron","boundary":[-672,-394,-416,-120],"count":4,"grow":True}, # {"type":"TBD","boundary":[194,-550,648,-407],"count":6,"grow":True}, # {"type":"TBD","boundary":[-431,-646,-242,-528],"count":6,"grow":True}, ], From 4914f7c354819430405b13292db77057489e3eb9 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sat, 25 Jan 2025 11:47:28 -0700 Subject: [PATCH 27/46] Item rename renamed Mummy Bones to just be Bones some items are too mob specific which creates alot of bloat materials that go unused had a discussion with Earthverse and we concluded that changing the item ID wouldnt be reasonable due to game issues and players codes, but simply changing the name would allow for other mobs to also drop the item(s) --- design/items.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/design/items.py b/design/items.py index 8125c8a..6b067af 100644 --- a/design/items.py +++ b/design/items.py @@ -6728,7 +6728,7 @@ skill_items={ crafting_items={ "mbones":{ "type":"material", - "name":"Mummy Bones", + "name":"Bones", "skin":"mbones", "explanation":"Scattered, ugly bones.", "s":True, From 0caa9a3a12713c187d15dafc8bee0ea57478073e Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sat, 25 Jan 2025 11:52:58 -0700 Subject: [PATCH 28/46] Fixed Gateway map doors fixed the doors in gateway leading to improper map names --- design/maps.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/design/maps.py b/design/maps.py index 7550c61..113cb15 100644 --- a/design/maps.py +++ b/design/maps.py @@ -1574,9 +1574,9 @@ maps={ ], "doors":[ [0,-47,46,36,"main",19,0], #door to main - [-321,-40,62,60,"dungeon1",1,1], #door to Dungeon 1 - [319,-249,62,46,"dungeon2",0,2], #door to Dungeon 2 - # [-321,-213,68,83,"spidercave",0,3,"key","spiderkey"], #door to spider + [-321,-40,62,60,"ucliffs",1,1], #door to Underground Cliffs + [319,-249,62,46,"uhills",0,2], #door to Underground Hills + # [-321,-213,68,83,"spider_instance",0,3,"key","spiderkey"], #door to spider _instance # [0,-859,58,44,"TBD",1,4], #door to (To Be Determined) ], "quirks":[ @@ -1626,7 +1626,7 @@ maps={ "spawns":[ [0,0], [720,-310], # Right door - [0,-691], # New Instance? + [0,-691], # New Future Instance? ], "doors":[ [0,77,56,64,"gateway",0,0], #door to Gateway From aad9a6338b9cb2ad784a0f9ad95a97746ff720c5 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sun, 26 Jan 2025 09:55:36 -0700 Subject: [PATCH 29/46] Changed Pclaw and Oozing Terror returned poison ability to plcaw but slightly nerfed it added scaling poison resistance to pclaw it looked like oozing terror had a typo in its poison ability. also the weapon fits somewhat thematically to have a poison chance made these changes after wiz confirmed he could help make poison ability --- design/items.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/design/items.py b/design/items.py index 6b067af..b85adff 100644 --- a/design/items.py +++ b/design/items.py @@ -2696,10 +2696,12 @@ weapons={ "tier":2.4, "skin":"pclaw", "damage_type":"physical", - #"ability":"poison", - #"attr0":1.5, + "ability":"poison", + "attr0":1, + "pnresistance":2, "upgrade":{ - #"attr0":0.5, + "attr0":0.5, + "pnresistance":1, }, "name":"Poison Claw", "g":72000, @@ -3795,12 +3797,12 @@ weapons={ "vit":-30, "int":20, "damage_type":"magical", - "ability":"posion", - "attr0":0.1, + "ability":"poison", + "attr0":1.5, "upgrade":{ "reflection":0.25, "int":1, - "attr0":0.02, + "attr0":1, }, "name":"Oozing Terror", "g":289000, From 4bae56c6a8c573a76bd653cda5ac6c3295997999 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sun, 26 Jan 2025 10:48:08 -0700 Subject: [PATCH 30/46] Work on Spider_instance added basic monsters spawns updated gateway map to allow access to the instance --- design/maps.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/design/maps.py b/design/maps.py index 113cb15..200604a 100644 --- a/design/maps.py +++ b/design/maps.py @@ -1567,16 +1567,16 @@ maps={ ], "spawns":[ [0,0], # Main entrance - [-320,-102], #Dungeon 1 entrance bottom left - [320,-240], #Dungeon 2 entrance top right - # [-320,-202], #Spider queen entrance - [0,-847], #Top entrance (unused) + [-320,-102], #Underground Cliffs entrance bottom left + [320,-240], #Underground Hills entrance top right + # [-320,-202], #Spider Den entrance + # [0,-847], #Top entrance (unused) ], "doors":[ [0,-47,46,36,"main",19,0], #door to main [-321,-40,62,60,"ucliffs",1,1], #door to Underground Cliffs [319,-249,62,46,"uhills",0,2], #door to Underground Hills - # [-321,-213,68,83,"spider_instance",0,3,"key","spiderkey"], #door to spider _instance + [-321,-213,68,83,"spider_instance",0,3,"key","spiderkey"], #door to spider _instance # [0,-859,58,44,"TBD",1,4], #door to (To Be Determined) ], "quirks":[ @@ -1670,8 +1670,9 @@ maps={ "npcs":[ ], "monsters":[ - # {"type":"spiderqueen","boundary":[2243.92,325.27,2689.64,505.06],"count":1}, - # {"type":"spider","boundary":[2243.92,325.27,2689.64,505.06],"count":1}, + {"type":"spiderqueen","boundary":[-45,-1535,43,-1502],"count":1}, + {"type":"spider","boundary":[-255,-880,-120,-600],"count":3}, + {"type":"spider","boundary":[120,-880,255,-600],"count":3}, ], "spawns":[ [0,10], From 15a4a3444fb2082df8993871bbdc7803f3fe73a1 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sun, 26 Jan 2025 10:57:03 -0700 Subject: [PATCH 31/46] New mobs added goldenbot and spider bosses --- design/sprites.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/design/sprites.py b/design/sprites.py index 57742cf..dea75bb 100644 --- a/design/sprites.py +++ b/design/sprites.py @@ -958,7 +958,7 @@ sprites={ "rows":2, "columns":4, "matrix":[ - [None,"sparkbot","targetron",None], + ["goldenbot","sparkbot","targetron",None], [None,None,None,None] ] }, @@ -979,6 +979,17 @@ sprites={ [None,None,None,None] ] }, + "spiderqueens":{ + "file":"/images/tiles/monsters/giantspider_shadow_1.png", + "rows":4, + "columns":1, + "matrix":[ + ["spiderbl"], + ["spiderbr"], + ["spiderp"], + ["spiderr"], + ] + }, "emblems":{ "file":"/images/sprites/emblems/emblems.png?v=6", "type":"emblem", From 4a1c679b22cda9cbcdac593a6a0fec059238647e Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sun, 26 Jan 2025 16:38:56 -0700 Subject: [PATCH 32/46] Added Spider Bosses Red, Black, and Brown Spider bosses added --- design/monsters.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/design/monsters.py b/design/monsters.py index 89937c1..698adf1 100644 --- a/design/monsters.py +++ b/design/monsters.py @@ -910,7 +910,7 @@ monsters={ [1000,"stat","int",1], [10000,"stat","pnresistance",1], [100000,"stat","evasion",15], - [1000000,"stat","reflection",0.5], + [1000000,"stat","reflection",1], [10000000,"stat","frequency",1], ] }, @@ -927,6 +927,21 @@ monsters={ [10000000,"stat","crit",0.5], ] }, + "spiderr":{ + "name":"Red Spider Queen","speed":0,"charge":0,"hp":4500000,"xp":9000000,"difficulty":15,"attack":10000,"damage_type":"physical","respawn":-1,"gold":1,"range":640,"frequency":0.4,"aggro":1,"rage":1, + "armor":65,"resistance":80, + "spawns":[[8000,"spider"]], + }, + "spiderbl":{ + "name":"Black Spider Queen","speed":0,"charge":0,"hp":4500000,"xp":9000000,"difficulty":12,"attack":1200,"damage_type":"physical","respawn":-1,"gold":1,"range":640,"frequency":1.1,"aggro":1,"rage":1, + "armor":110,"resistance":135, + "spawns":[[6000,"spider"]], + }, + "spiderbr":{ + "name":"Brown Spider Queen","speed":0,"charge":0,"hp":4500000,"xp":9000000,"difficulty":10,"attack":840,"damage_type":"physical","respawn":-1,"gold":1,"range":640,"frequency":2,"aggro":1,"rage":1, + "armor":90,"resistance":115, + "spawns":[[5000,"spider"]], + }, "welemental":{"name":"Water Elemental","speed":20,"hp":80000,"xp":10,"attack":1800,"damage_type":"physical","respawn":1,"gold":1,"range":80,"frequency":1.2,"aggro":0.2,"evasion":80}, "felemental":{"name":"Fire Elemental","speed":20,"hp":80000,"xp":10,"attack":1800,"damage_type":"physical","respawn":1,"gold":1,"range":80,"frequency":1.2,"aggro":0.2,"evasion":80}, "nelemental":{"name":"Nature Elemental","speed":20,"hp":80000,"xp":10,"attack":1800,"damage_type":"physical","respawn":1,"gold":1,"range":80,"frequency":1.2,"aggro":0.2,"evasion":80}, From 7c73b78e073bc917cbcebb52754b04fd0bbec2fa Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sun, 26 Jan 2025 16:51:30 -0700 Subject: [PATCH 33/46] Further work on Spider Instance the spider instance will consist of 3 bosses simultaneously --- design/maps.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/design/maps.py b/design/maps.py index 200604a..4aaadaf 100644 --- a/design/maps.py +++ b/design/maps.py @@ -1670,7 +1670,9 @@ maps={ "npcs":[ ], "monsters":[ - {"type":"spiderqueen","boundary":[-45,-1535,43,-1502],"count":1}, + {"type":"spiderr","boundary":[0,-1515,1,-1516],"count":1}, + {"type":"spiderbl","boundary":[-192,-1515,-191,-1516],"count":1}, + {"type":"spiderbr","boundary":[192,-1515,191,-1516],"count":1}, {"type":"spider","boundary":[-255,-880,-120,-600],"count":3}, {"type":"spider","boundary":[120,-880,255,-600],"count":3}, ], From 5529e8a0ebb84c1d23bc62a143c2a4bf233dadf8 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sun, 26 Jan 2025 23:04:30 -0700 Subject: [PATCH 34/46] Added spider boss drops --- design/drops.py | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/design/drops.py b/design/drops.py index 2f95b2d..d5c17f6 100644 --- a/design/drops.py +++ b/design/drops.py @@ -529,20 +529,41 @@ drops={ [1.0/50000,"tombkey"], ], "ggreenpro":[ - [1.0/25,"spikedhelmet"], - [1.0/10000,"tombkey"], + [1.0/25,"spikedhelm"], + [1.0/20000,"tombkey"], ], "gredpro":[ - [1.0/25,"spikedhelmet"], - [1.0/10000,"tombkey"], + [1.0/25,"spikedhelm"], + [1.0/20000,"tombkey"], ], "gbluepro":[ - [1.0/25,"spikedhelmet"], - [1.0/10000,"tombkey"], + [1.0/25,"spikedhelm"], + [1.0/20000,"tombkey"], ], "gpurplepro":[ - [1.0/25,"spikedhelmet"], - [1.0/10000,"tombkey"], + [1.0/25,"spikedhelm"], + [1.0/20000,"tombkey"], + ], + "spiderr":[ + [1.0/1.0,"cocoon"], + [1.0/1.0,"spidersilk"], + [1.0/1.0,"spidersilk"], + [1.0/1.0,"poison"], + [1.0/3.0,"troll"], + ], + "spiderbl":[ + [1.0/1.0,"cocoon"], + [1.0/1.0,"spidersilk"], + [1.0/1.0,"spidersilk"], + [1.0/1.0,"poison"], + [1.0/3.0,"troll"], + ], + "spiderbr":[ + [1.0/1.0,"cocoon"], + [1.0/1.0,"spidersilk"], + [1.0/1.0,"spidersilk"], + [1.0/1.0,"poison"], + [1.0/3.0,"troll"], ], }, "konami":[ From 70c7f2ede0f3e4f0f4363c5859da4e5d8e58e83f Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sun, 26 Jan 2025 23:08:47 -0700 Subject: [PATCH 35/46] Added 2 new recipes Weaver bow cocoon --- design/recipes.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/design/recipes.py b/design/recipes.py index 5b63664..4d89e7f 100644 --- a/design/recipes.py +++ b/design/recipes.py @@ -491,6 +491,19 @@ craft={ ], "cost":24000, }, + "weaver":{ + "items":[ + [1,"bow"], + [30,"cocoon"], + ], + "cost":75000, + }, + "cocoon":{ + "items":[ + [1000,"spidersilk"], + ], + "cost":2500, + }, "elixirint1":{"items":[[10,"elixirint0"]],"cost":1000}, "elixirdex1":{"items":[[10,"elixirdex0"]],"cost":1000}, "elixirvit1":{"items":[[10,"elixirvit0"]],"cost":1000}, @@ -642,4 +655,4 @@ dismantle={ # ], # "cost":20, # }, -} \ No newline at end of file +} From 75c38e8411b7c8be0037a1efe98575ae05947a12 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sun, 26 Jan 2025 23:10:51 -0700 Subject: [PATCH 36/46] Added rage boundary to spider bosses --- design/maps.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/design/maps.py b/design/maps.py index 4aaadaf..dd0f4f4 100644 --- a/design/maps.py +++ b/design/maps.py @@ -1670,9 +1670,9 @@ maps={ "npcs":[ ], "monsters":[ - {"type":"spiderr","boundary":[0,-1515,1,-1516],"count":1}, - {"type":"spiderbl","boundary":[-192,-1515,-191,-1516],"count":1}, - {"type":"spiderbr","boundary":[192,-1515,191,-1516],"count":1}, + {"type":"spiderr","boundary":[0,-1515,1,-1516],"count":1,"rage":[-320,-1700,320,-1150]}, + {"type":"spiderbl","boundary":[-192,-1515,-191,-1516],"count":1,"rage":[-320,-1700,320,-1150]}, + {"type":"spiderbr","boundary":[192,-1515,191,-1516],"count":1,"rage":[-320,-1700,320,-1150]}, {"type":"spider","boundary":[-255,-880,-120,-600],"count":3}, {"type":"spider","boundary":[120,-880,255,-600],"count":3}, ], From 0ceee6825cd21bd0460b8998e8e1744befa66e23 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sun, 26 Jan 2025 23:40:13 -0700 Subject: [PATCH 37/46] Delete images/tiles/items/community.png --- images/tiles/items/community.png | Bin 2953 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 images/tiles/items/community.png diff --git a/images/tiles/items/community.png b/images/tiles/items/community.png deleted file mode 100644 index 49c1c388564dcc931ab17792d2ca38312d0939da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2953 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 From 152441a784c3731ec499dded86ff387289095b83 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sun, 26 Jan 2025 23:40:37 -0700 Subject: [PATCH 38/46] Added Spider key to the sprite sheet --- images/tiles/items/community.png | Bin 0 -> 3234 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 images/tiles/items/community.png diff --git a/images/tiles/items/community.png b/images/tiles/items/community.png new file mode 100644 index 0000000000000000000000000000000000000000..5977ddc59e02178d8a78b19bb5af09e4147867ff GIT binary patch literal 3234 zcmeAS@N?(olHy`uVBq!ia0y~yVCZ3BVA#UJ#=yYf_VUO-1_lPk;vjb?hIQv;UNSK7 z#CWc%o(U_14=^-M30UoX zQE-duiiW3$!xnfIzVZlS;XHBtg^R?3QZ_*ig@owio=OosmzFiiN6cJx+5SV>y~*?5 z-kkk+M|t_?-#04X*+-VWpZEFB=ihIu&+QEV+`{gzaD?N@QLF8X79HCB-rU^$^aMrc zGxq#)HX3(#m3G&petve=aR2*!LTE=`#6eeLDnN#CMP6X%@Vn{&I*VW(41@PlA= z-oNvyG;>+Isa<);SiragA zwx_#a)cyV|>i++y+pY#(*lCcT`&E8#9*x1h|6dec!WCb)|Rma%b(+KlP?= z%71-i3hS1c-Ex+qk#aFvF}mv8ZD*FvzV+>ZX|V6^|F??mjBLWc?Yy?fZky4+AmwES zudlEFzRZ7qo}IR??$>Yc@85s5wYo3fYQMp`opG6&D_e5?Z*RZcFY5SzmCm;xH(M;% z)?GZgYWMW~o-KvW|7Y8V&#Abi z^7hNh<=d*S*M2TKdH($L&F^bHm-+wByYyaV2GgETpNcf~US<2O%+HyyYuBy=Z-1uV z{CX%(viLTKvUlOZ&}C{d032R-XF zU-#6WK91gYwNzhr%CR;}f_0 zdH;RcAMN=#oL2chOAh_{7H+)w*w1(D*+F8c_iHQ(t?$EUHkExy0`QqTWH&k(clS>p0>s>;jtMamUr{3W!z!^Ea8 z+prq=NV2t=I8p)F{IM( z+La|+wr*u=U1`EU=jVytA8w@|Kcn@- z+SKD`Z}`@2+I{Eit@`D=Gv_Xjd0|~P#q#+6X`UKq-jz^S7UNzi;DEQnORGxy7q^w*B{<AIKC`mQ-C~8tyGqBUAMbw;tc=sCI-_G2o7Y`R4Xw7U{_pzpqWkX2X&hD=RdG6*Av0E~ z-cG$dtNqd|@1+;*_~usHKb&@Zt;xH0o=Z0t-B^B8D|F2(;b*h%7KhI9vCZ$As(67R zYpQ3tRgv{|t>VYuxu2fBzkh0B;-5hWb zar!EQ+`oGr4rNT0w0hPxW&7oS-50i=Iq~ORu2T0~Z|$=yAM5g8zqD3oWR4AYJv30j% zFRg!ad(q`dT#we9jM|Pp}qbHKom*S`aAewz^Yp z*M->MKQ4JNX!mxN6wPa)O#~DlcQF7KlN8mWapFD{bjdY zU863NU$}gF%Ic1(Y1f#!&r}@?Q+PLJ(>bn1hr;Al=Eq_%dD>lxJ zWO)8hXokXU Date: Sun, 26 Jan 2025 23:42:44 -0700 Subject: [PATCH 39/46] Created Spider Key --- design/dimensions.py | 1 + 1 file changed, 1 insertion(+) diff --git a/design/dimensions.py b/design/dimensions.py index 6f8f025..44bb621 100644 --- a/design/dimensions.py +++ b/design/dimensions.py @@ -983,6 +983,7 @@ positions={ "cryptkey":["custom",0,3], "tombkey":["custom",1,3], "frozenkey":["custom",2,3], + "spiderkey":["community",0,1], "cyber":["custom",3,3], "vattire":["custom",0,4], "vgloves":["custom",1,4], From 9c14c1743ff223980d245c0849eb541b1a09c6f1 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sun, 26 Jan 2025 23:46:12 -0700 Subject: [PATCH 40/46] Created Spider Key Raised all key stacks to 50 --- design/items.py | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/design/items.py b/design/items.py index b85adff..93c4159 100644 --- a/design/items.py +++ b/design/items.py @@ -5807,7 +5807,7 @@ quest={ #"ignore":True, "g":50000, "explanation":"A stone key, imbued with magical energy.", - "s":10, + "s":50, }, "cryptkey":{ "type":"dungeon_key", @@ -5817,7 +5817,7 @@ quest={ #"ignore":True, "g":50000, "explanation":"A key, imbued with magical energy.", - "s":10, + "s":50, }, "frozenkey":{ "type":"dungeon_key", @@ -5827,7 +5827,7 @@ quest={ #"ignore":True, "g":50000, "explanation":"A key, imbued with magical energy.", - "s":10, + "s":50, }, "tombkey":{ "type":"dungeon_key", @@ -5837,7 +5837,17 @@ quest={ #"ignore":True, "g":50000, "explanation":"A key, imbued with magical energy.", - "s":10, + "s":50, + }, + "spiderkey":{ + "type":"dungeon_key", + "skin":"spiderkey", + "name":"The Spider Key", + "opens":"spider_instance", + #"ignore":True, + "g":50000, + "explanation":"A key, imbued with magical energy.", + "s":50, }, "bkey":{ "type":"bank_key", @@ -5846,7 +5856,7 @@ quest={ "unlocks":"bank_b", #"ignore":True, "g":5000000, - "s":5, + "s":50, "explanation":"Key to the bank's basement", "action":"UNLOCK", "onclick":"socket.emit('activate',{num:locate_item('bkey')})", @@ -5857,7 +5867,7 @@ quest={ "name":"The Bank Key", "unlocks":"bank_u", #"ignore":True, - "s":3, + "s":50, "g":50000000, "explanation":"Key to the bank's underground", "action":"UNLOCK", @@ -5868,7 +5878,7 @@ quest={ "skin":"dkey", "name":"Diamond Key", #"ignore":True, - "s":2, + "s":50, "g":72000000, "explanation":"A key that unlocks any teller!", "action":"UNLOCK", From 1f4abe7add377c305b13d5816dca84cbb029ec8f Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Sun, 26 Jan 2025 23:49:25 -0700 Subject: [PATCH 41/46] Added Spider Key Drop --- design/drops.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/design/drops.py b/design/drops.py index d5c17f6..a6c8941 100644 --- a/design/drops.py +++ b/design/drops.py @@ -270,7 +270,7 @@ drops={ "pinkgoblin":[ [1.0/24000,"bkey"], ], - "spider":[[0.001,"spidersilk"],[1.0/500000,"offeringp"]], + "spider":[[0.001,"spidersilk"],[1.0/500000,"offeringp"],[1.0/75000,"spiderkey"]], "tinyp":[[1.0/1,"offeringp"]], "gscorpion":[[0.002,"quiver"]], "xscorpion":[[0.0024,"quiver"],[0.00024,"vitscroll"],[2.0/1000000,"glitch"],[8.0/100000,"svenom"]], From ab01666c9379a465ce3aa8f2035546d37aa95a9d Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Mon, 27 Jan 2025 00:01:07 -0700 Subject: [PATCH 42/46] Added Golden Bot --- design/monsters.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/design/monsters.py b/design/monsters.py index 698adf1..fcbfced 100644 --- a/design/monsters.py +++ b/design/monsters.py @@ -1014,6 +1014,20 @@ monsters={ [5000,"stat","gold",5], ] }, + "goldenbot":{ + "name":"Golden Bot","speed":24,"hp":500000,"xp":420000,"attack":500,"damage_type":"physical","respawn":-1,"gold":120000,"range":35,"frequency":1,"aggro":0.2,"aa":1, + "difficulty":100, + "phresistance":75, + "explanation":"Spawns in Underground Hills around every 100,000 Sparkbot or Targetron spawns", + "achievements":[ + [1,"stat","gold",1], + [10,"stat","luck",1], + [100,"stat","gold",1], + [1000,"stat","range",1], + [2000,"stat","frequency",1], + [5000,"stat","gold",5], + ] + }, "tinyp":{ "name":"Fairy","speed":24,"hp":5600,"xp":12000,"attack":240,"damage_type":"physical","respawn":-1,"gold":120000,"range":35,"frequency":5,"aggro":0.3,"aa":1, "escapist":True,"roam":True,"cute":True, From c0140d2ab547b4205688964f750a9928db5bf247 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Mon, 27 Jan 2025 00:07:15 -0700 Subject: [PATCH 43/46] Added Golden Bot drop table --- design/drops.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/design/drops.py b/design/drops.py index a6c8941..b3e777f 100644 --- a/design/drops.py +++ b/design/drops.py @@ -517,6 +517,14 @@ drops={ [1.0/4000,"bronzeingot"], [1.0/400,"bronzenugget"], ], + "goldenbot":[ + [1.0/1,"handofmidas"], + [1.0/2,"goldenegg"], + [1.0/50,"goldring"], + [1.0/75,"goldbooster"], + [1.0/150,"ukey"], + [1.0/1000000,"goldenpowerglove"], + ], "dryad":[ [1.0/5000,"pclaw"], [1.0/500,"essenceofnature"], From c8e6964139d815923ecdd620ccd5ef2a762a634b Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Mon, 27 Jan 2025 13:36:23 -0700 Subject: [PATCH 44/46] Door removal removed the door connecting between "d_e" and the old gateway map "d_g" --- design/maps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/design/maps.py b/design/maps.py index dd0f4f4..e26c6fb 100644 --- a/design/maps.py +++ b/design/maps.py @@ -398,7 +398,7 @@ maps={ [0.08,-291.85], ], "doors":[ - [-0.15,-299.63,35.39,51.17,"d_g",0,1], + # [-0.15,-299.63,35.39,51.17,"d_g",0,1], ], "quirks":[ ], From 5976d7bca0af12c1c8d4debc6c9087cd6928319c Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Mon, 27 Jan 2025 13:49:51 -0700 Subject: [PATCH 45/46] Added Golden Bot Spawn Mechanic hopefully i did this right, couldnt get any help in the discord --- node/server_functions.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/node/server_functions.js b/node/server_functions.js index b41985f..bffb11b 100644 --- a/node/server_functions.js +++ b/node/server_functions.js @@ -34,6 +34,7 @@ var stats = { var edges = { next_goldenbat: 80000, next_cutebee: 480000, + next_goldenbot: 100000, }; var NPC_prefix = "NPC0000000000000000NPC"; @@ -1805,6 +1806,20 @@ function spawn_special_monster(type) { new_monster(pack.i, pack); // broadcast("game_event",{name:"goldenbat",map:pack.i}); } + if (type == "goldenbot") { + var packs = []; + ["uhills"].forEach(function (m) { + G.maps[m].monsters.forEach(function (p) { + if (!p.boundaries && (p.type === "targetron" || p.type === "sparkbot")) { + packs.push({ type: "goldenbot", boundary: p.boundary, count: 1, i: m, roam: true }); + } + }); + }); + var pack = packs[floor(Math.random() * packs.length)]; + pack.gold = D.monster_gold.goldenbot; + new_monster(pack.i, pack); + // broadcast("game_event",{name:"goldenbot",map:pack.i}); + } if (type == "cutebee") { var packs = []; ["main"].forEach(function (m) { @@ -2072,6 +2087,11 @@ function event_loop() { spawn_special_monster("goldenbat"); } + if (events.goldenbot && (stats.kills.targetron + stats.kills.sparkbot) > edges.next_goldenbot) { + edges.next_goldenbot += parseInt(events.goldenbot * Math.random()); + spawn_special_monster("goldenbot"); + } + if (events.cutebee && stats.kills.bee > edges.next_cutebee) { edges.next_cutebee += parseInt(events.cutebee * Math.random()); spawn_special_monster("cutebee"); From 90ce49d9c7203009861093a818a3e7494f52dc19 Mon Sep 17 00:00:00 2001 From: Crowns3bc <44653214+Crowns3bc@users.noreply.github.com> Date: Mon, 27 Jan 2025 13:53:05 -0700 Subject: [PATCH 46/46] Fixed spacing issue hopefully fix it from when adding goldenbot --- node/server_functions.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/node/server_functions.js b/node/server_functions.js index bffb11b..e67869b 100644 --- a/node/server_functions.js +++ b/node/server_functions.js @@ -2087,10 +2087,10 @@ function event_loop() { spawn_special_monster("goldenbat"); } - if (events.goldenbot && (stats.kills.targetron + stats.kills.sparkbot) > edges.next_goldenbot) { - edges.next_goldenbot += parseInt(events.goldenbot * Math.random()); - spawn_special_monster("goldenbot"); - } + if (events.goldenbot && (stats.kills.targetron + stats.kills.sparkbot) > edges.next_goldenbot) { + edges.next_goldenbot += parseInt(events.goldenbot * Math.random()); + spawn_special_monster("goldenbot"); + } if (events.cutebee && stats.kills.bee > edges.next_cutebee) { edges.next_cutebee += parseInt(events.cutebee * Math.random()); @@ -2231,7 +2231,7 @@ function event_loop() { if ( (player.level < 50 && Math.random() > 0.08) || (G.maps[player.map] && - (G.maps[player.map].safe || G.maps[player.map].instance || G.maps[player.map].irregular)) + (G.maps[player.map].safe || G.maps[player.map].instance || G.maps[player.map].irregular)) ) { player = null; }