Merge pull request #166 from Crowns3bc/Content-Patch-1

Content patch 1

design/dimensions.py

@@ -204,6 +204,7 @@ positions={
 	"hhelmet":["",4,0],
 	#"xhelmet":["pack_1a",13,23], #t4
 	"xhelmet":["",5,0],
+	"spikedhelmet":["",12,0],
 	#"phelmet":["pack_1a",5,116], #pumpkin
 	"phelmet":["",11,29],
 	#"coat":["pack_1a",8,3], #t1
@@ -519,6 +520,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],
@@ -691,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],
@@ -701,6 +704,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 +934,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,17 +970,20 @@ 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],
 
 	"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],
@@ -1002,4 +1010,4 @@ positions={
 	#"claw":["",13,42],
 	
 	"friendtoken":["",15,33],
-}
+}

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"]],
@@ -499,6 +499,80 @@ 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"],
+		],
+		"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"],
+			[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"],
+		],
+		"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":[
 		[6.0/10000000,"powerglove"],

design/items.py

@@ -543,6 +543,24 @@ armor={
 		"g":3200000,
 		"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,
+	},
 	"luckyt":{
 		#"set":"base",
 		"type":"chest",
@@ -1916,7 +1934,7 @@ accessories={
 	},
 	"zapper":{
 		"type":"ring",
-		"skin":"trigger",
+		"skin":"zapper",
 		"rpiercing":10,
 		"int":10,
 		"str":5,
@@ -2672,6 +2690,24 @@ weapons={
 		"a":True,
 		"grades":[0,7],
 	},
+	"pclaw":{
+		"type":"weapon",
+		"wtype":"fist",
+		"tier":2.4,
+		"skin":"pclaw",
+		"damage_type":"physical",
+		"ability":"poison",
+		"attr0":1,
+		"pnresistance":2,
+		"upgrade":{
+			"attr0":0.5,
+			"pnresistance":1,
+		},
+		"name":"Poison Claw",
+		"g":72000,
+		"a":True,
+		"grades":[0,7],
+	},
 	"stinger":{
 		"type":"weapon",
 		"wtype":"dagger",
@@ -2969,7 +3005,7 @@ weapons={
 		"tier":3,
 		"speed":2,
 		"evasion":5,
-		"skin":"t3bow",
+		"skin":"harpybow",
 		"damage_type":"physical",
 		"upgrade":{
 		},
@@ -3592,6 +3628,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",
@@ -3745,12 +3797,12 @@ weapons={
 		"vit":-30,
 		"int":20,
 		"damage_type":"magical",
-		"ability":"posion",
+		"ability":"poison",
-		"attr0":0.1,
+		"attr0":1.5,
 		"upgrade":{
 			"reflection":0.25,
 			"int":1,
-			"attr0":0.02,
+			"attr0":1,
 		},
 		"name":"Oozing Terror",
 		"g":289000,
@@ -4198,6 +4250,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={
@@ -5734,7 +5807,7 @@ quest={
 		#"ignore":True,
 		"g":50000,
 		"explanation":"A stone key, imbued with magical energy.",
-		"s":10,
+		"s":50,
 	},
 	"cryptkey":{
 		"type":"dungeon_key",
@@ -5744,7 +5817,7 @@ quest={
 		#"ignore":True,
 		"g":50000,
 		"explanation":"A key, imbued with magical energy.",
-		"s":10,
+		"s":50,
 	},
 	"frozenkey":{
 		"type":"dungeon_key",
@@ -5754,7 +5827,7 @@ quest={
 		#"ignore":True,
 		"g":50000,
 		"explanation":"A key, imbued with magical energy.",
-		"s":10,
+		"s":50,
 	},
 	"tombkey":{
 		"type":"dungeon_key",
@@ -5764,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",
@@ -5773,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')})",
@@ -5784,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",
@@ -5795,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",
@@ -6657,7 +6740,7 @@ skill_items={
 crafting_items={
 	"mbones":{
 		"type":"material",
-		"name":"Mummy Bones",
+		"name":"Bones",
 		"skin":"mbones",
 		"explanation":"Scattered, ugly bones.",
 		"s":True,
@@ -6693,7 +6776,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,

design/maps.py

@@ -398,87 +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":[
-		],
-		"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]]},
-		]
-	},
-	"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":[
 		],
@@ -676,6 +596,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 +622,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"],
@@ -1309,12 +1231,14 @@ maps={
 			[784,-1060], #2-spooky
 			[-1071,-1485], #3-level1
 			[1212,101,3], #4-main
+			[-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,"mforest",0,0],
 		],
 		"quirks":[
 			[-228,-178,32,40,"log","Locked but there are noises coming from inside"],
@@ -1635,6 +1559,144 @@ maps={
 		"unlist":True,
 		"lux":0.4,
 	},
+    "gateway":{
+		"key":"jayson_pvpDungeon_gateway",
+		"name":"Underground [Gateway]",
+		"npcs":[
+		],
+		"monsters":[
+		],
+		"spawns":[
+			[0,0], # Main entrance
+			[-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
+			# [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
+			[-513,-697], # unused door spawn
+		],
+		"doors":[
+			# [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":[
+		],
+		"drop_norm":5000,
+		"unlist":True,
+		"lux":0.4,
+	},
+	"uhills":{
+		"key":"jayson_pvpDungeon_a2",
+		"name":"Underground [Hills]",
+		"npcs":[
+		],
+		"monsters":[
+			{"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},
+		],
+		"spawns":[
+			[0,0], 
+			[720,-310], # Right door
+			[0,-691], # New Future 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":"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], 
+		],
+		"doors":[
+			[1,-32,40,49,"halloween",5,0], #door to Halloween
+		],
+		"quirks":[
+		],
+		"drop_norm":5000,
+		"unlist":True,
+		"lux":0.6,
+	},
+	"spider_instance":{
+		"key":"jayson_pvpDungeon_b1",
+		"name":"The Spider Den",
+		"npcs":[
+		],
+		"monsters":[
+			{"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},
+		],
+		"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],
+		],
+		"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,
+	},
 
 }
 for name in maps:

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,
 	# },
-}
+}

design/sprites.py

@@ -953,6 +953,43 @@ sprites={
 			["mrgreen"],
 		]
 	},
+	"robots1":{
+		"file":"/images/tiles/monsters/robots_walkin_B_1.png",
+		"rows":2,
+		"columns":4,
+		"matrix":[
+			["goldenbot","sparkbot","targetron",None],
+			[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]
+		]
+	},
+	"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",

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");
@@ -2211,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;
 						}