Merge branch 'refactor' into shinytags

Author: Toneblock

Cryptid.lua

@@ -76,12 +76,12 @@ local function process_items(f, mod)
 					item.dependencies[#item.dependencies + 1] = mod.id
 				end
 				if item.init then item:init() end
-				if not item.gameset_config then
+				--[[if not item.gameset_config then
 					-- by default, disable on modest
 					item.gameset_config = {
 						modest = {disabled = true},
 					}
-				end
+				end--]]
 				if G.PROFILES[G.SETTINGS.profile].all_unlocked then
 					-- There's something a bit goofy about this, it shouldn't kick in this early
 					item.alerted = true

items/achievement.lua

@@ -447,4 +447,4 @@ local achievement_objects = {
 	traffic_jam,
 	perfectly_balanced,
 }
-return { name = "Achievements", init = function() end, items = achievement_objects,  }
+return { name = "Achievements", items = achievement_objects,  }

items/blind.lua

@@ -1,5 +1,10 @@
 local oldox = {
 	object_type = "Blind",
+	dependencies = {
+		items = {
+			"set_cry_blind",
+		},
+	},
 	name = "cry-oldox",
 	key = "oldox",
 	pos = { x = 0, y = 0 },
@@ -20,6 +25,11 @@ local oldox = {
 }
 local oldhouse = {
 	object_type = "Blind",
+	dependencies = {
+		items = {
+			"set_cry_blind",
+		},
+	},
 	name = "cry-oldhouse",
 	key = "oldhouse",
 	pos = { x = 0, y = 2 },
@@ -353,7 +363,6 @@ local trick = {
         end--]]
 	end,
 }
-
 local joke = {
 	dependencies = {
 		items = {
@@ -566,10 +575,8 @@ local pin = {
 		return false
 	end,
 }
-
 --It seems Showdown blind order is seperate from normal blind collection order? convenient for me at least
 --Nvm they changed it
-
 local lavender_loop = {
 	dependencies = {
 		items = {
@@ -704,7 +711,6 @@ local vermillion_virus = {
 		end
 	end,
 }
-
 local sapphire_stamp = {
 	dependencies = {
 		items = {
@@ -744,7 +750,6 @@ local sapphire_stamp = {
 		end
 	end,
 }
-
 local obsidian_orb = {
 	dependencies = {
 		items = {
@@ -1241,7 +1246,40 @@ local obsidian_orb = {
 		return disp_text
 	end,
 }
-
+local trophy = {
+	dependencies = {
+		items = {
+			"set_cry_blind",
+		},
+	},
+	mult = 1,
+	object_type = "Blind",
+	name = "cry-Lemon Trophy",
+	key = "trophy",
+	pos = { x = 0, y = 17 },
+	dollars = 8,
+	boss = {
+		min = 3,
+		max = 10,
+		showdown = true,
+	},
+	atlas = "blinds",
+	order = 95,
+	boss_colour = HEX("bbdb44"),
+	set_blind = function(self, reset, silent)
+		G.GAME.trophymod = true
+	end,
+	defeat = function(self, silent)
+		if G.GAME.trophymod then
+			G.GAME.trophymod = nil
+		end
+	end,
+	disable = function(self, silent)
+		if G.GAME.trophymod then
+			G.GAME.trophymod = nil
+		end
+	end,
+}
 local items_togo = {
 	oldox,
 	oldhouse,
@@ -1268,5 +1306,6 @@ local items_togo = {
 	obsidian_orb,
 	clock,
 	lavender_loop,
+	trophy,
 }
-return { name = "Blinds", init = function() end, items = items_togo, }
+return { name = "Blinds", items = items_togo, }

items/challenge.lua

@@ -572,4 +572,4 @@ for k, v in pairs(G.P_CENTERS) do
 	end
 end
 
-return { name = "Challenges", init = function() end, items = challenges,  }
+return { name = "Challenges", items = challenges,  }