Merge branch 'main' into achievement-adjustments

design/drops.py

@@ -16,24 +16,10 @@ drops={
 		
 		],
 		"global":[
-			#[0.00001,"ornament"],
-			#[0.00003,"mistletoe"],
-			#[0.00001,"candycane"],
-			#[0.000001,"open","xN"],
-			#[0.00006,"ornament"],
-			#[0.00018,"mistletoe"],
-			#[0.00005,"candycane"],
-			#[0.00001,"open","xN"],
-			#[0.00005,"candy0"], #originally 4X [11/10/19]
-			#[0.00125,"candy1"], #originally 4X [11/10/19]
 			#[0.000015,"goldenegg"], #originally 0.000005
-			#[0.000001,"5bucks"],
+			[0.0000001,"5bucks"],
 			#[0.0002,"gift0"],
 			#[0.004,"gift1"],
-			#[0.0006,"ornament"],
-			#[0.0018,"mistletoe"],
-			#[0.0005,"candycane"],
-			#[0.0001,"open","xN"],
 			#[0.0004,"redenvelope"],
 			#[0.00005,"goldenegg"],
 			#[0.009,"open","eastereggs"], #originally 0.009
@@ -41,7 +27,7 @@ drops={
 			#[0.0001,"redenvelopev3"],
 			#[0.00005,"greenenvelope"],
 			#[0.0001,"redenvelopev4"],
-			#[0.001,"candypop"],
+			[0.001,"candypop"],
 		],
 		"main":[
 			[0.0007,"ringsj"],
@@ -520,19 +506,19 @@ drops={
 	],
 	"statamulet":[
 		[1,"intamulet"],
-		[1.2,"stramulet"],
+		[1,"stramulet"],
 		[1,"dexamulet"],
 	],
 	"statbelt":[
 		[1,"intbelt"],
-		[1.05,"strbelt"],
+		[1,"strbelt"],
 		[1,"dexbelt"],
 	],
 	"statring":[
 		[1,"intring"],
 		[1,"vitring"],
 		[1,"dexring"],
-		[1.2,"strring"],
+		[1,"strring"],
 	],
 	"basicelixir":[
 		[1,"elixirvit0"],
@@ -718,6 +704,7 @@ drops={
 		[0.3,"lmace",None,None,"lucky"],
 		[1,"oxhelmet",None,None,"lucky"],
 		[0.1,"cdragon",None,None,"lucky"],
+		[0.1,"snakeoil"], #2025
 	],
 	"eastereggs":[
 		[1,"egg0"],
@@ -855,7 +842,6 @@ drops={
 		[1,"cupid"],
 	],
 	"candy0":[
-		[1,"pmaceofthedead"],
 		[0.008,"spookyamulet"],
 		[1,"gold",480000],
 		[0.0005,"cxjar",1,"hat410"],
@@ -971,10 +957,10 @@ drops={
 		[0.5,"empty"],
 	],
 	"weaponofthedead":[
-		[0.85,"bowofthedead"],
-		[0.35,"swordofthedead"],
+		[1,"bowofthedead"],
+		[1,"swordofthedead"],
 		[1,"maceofthedead"],
-		[0.1,"pmaceofthedead"],
+		[1,"pmaceofthedead"],
 		[1,"staffofthedead"],
 		[1,"daggerofthedead"],
 	],

design/items.py

@@ -198,7 +198,7 @@ armor={
 		"set":"fury",
 		"tier":1.5,
 		"type":"helmet",
-		"class":["rogue","warrior"],
+		"class":["rogue","warrior","ranger","paladin"],
 		"skin":"fury",
 		"scroll":True,
 		#"evasion":1,
@@ -2031,7 +2031,7 @@ accessories={
 		"skin":"mearring",
 		"luck":8,
 		"compound":{
-			"luck":1,
+			"luck":4,
 		},
 		"name":"Mistletoe Earring",
 		"g":12000000,
@@ -2226,7 +2226,7 @@ accessories={
 		"skin":"stramulet",
 		"str":4,
 		"compound":{
-			"str":2,
+			"str":3,
 		},
 		"name":"Amulet of Strength",
 		"g":30000,
@@ -2244,7 +2244,7 @@ accessories={
 	"t2stramulet":{
 		"type":"amulet",
 		"skin":"t2stramulet",
-		"str":5,
+		"str":6,
 		"resistance":30,
 		"compound":{
 			"str":3,
@@ -2258,10 +2258,10 @@ accessories={
 	"t2intamulet":{
 		"type":"amulet",
 		"skin":"t2intamulet",
-		"int":5,
+		"int":6,
 		"armor":30,
 		"compound":{
-			"int":2,
+			"int":3,
 			"armor":20,
 		},
 		"name":"Amulet of the Fierce Mage",

design/maps.py

@@ -544,7 +544,7 @@ maps={
 		#"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.lunarNewYear",
 		"name":"Mainland",
 		"npcs":[
 			#{"id":"newupgrade","position":[-203,-174]},
@@ -1173,7 +1173,7 @@ maps={
 		"monsters":[
 			{"type":"stompy","boundary":[30,-2954,836,-2536],"count":1},
 			{"type":"wolf","boundary":[30,-2954,836,-2536],"count":7,"grow":True}, #added grow 31/1/2024
-			#{"type":"rudolph","boundary":[1065,-1598,1418,-1449],"count":1}, #xmas
+			{"type":"rudolph","boundary":[1065,-1598,1418,-1449],"count":1}, #xmas
 			{"type":"arcticbee","boundary":[682,-967,1482,-779],"count":10,"grow":True},
 			{"type":"wolfie","boundary":[-367,-2234,29,-1819],"count":4,"grow":True}, #added grow 31/1/2024
 			{"type":"wolfie","boundary":[236,-2232,460,-1847],"count":3,"grow":True}, #added grow 31/1/2024
@@ -1221,6 +1221,7 @@ maps={
 		"npcs":[
 			{"id":"transporter","position":[-14,-477]},
 			{"id":"locksmith","position":[316,-270]},
+			{"id":"scrollsmith","position":[606,-1590]},
 		],
 		"monsters":[
 			{"type":"plantoid","boundary":[-1013,-472,-575,-130],"count":4,"grow":True}, #added grow 31/1/2024

design/npcs.py

@@ -891,6 +891,13 @@ npcs={
 		"type":"fullstatic",
 		"name":"Smith",
 	},
+	"scrollsmith":{
+		"role":"scrollsmith",
+		"skin":"bsoldier",
+		"says":"X",
+		"type":"fullstatic",
+		"name":"Sir Bob",
+	},
 	"transporter":{
 		"role":"transport",
 		"skin":"spell",

design/sprites.py

@@ -372,7 +372,7 @@ sprites={
 		"columns":4,
 		"matrix":[
 			[None,"nexus",None,None],
-			[None,None,None,None],
+			[None,None,"bsoldier",None],
 		]
 	},
 	"military3":{
@@ -1143,4 +1143,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,
-}
+}