diff --git a/compat/cryptid.lua b/compat/cryptid.lua index d11a89f6..7a3f0558 100644 --- a/compat/cryptid.lua +++ b/compat/cryptid.lua @@ -18,7 +18,6 @@ if SMODS.Mods.Cryptid and SMODS.Mods.Cryptid.can_load then "compat/cryptid/reverse_codes", "compat/cryptid/other_consumables", "compat/cryptid/misc_jokers", - "compat/cryptid/gameset" } local items = Entropy.collect_files(files) diff --git a/compat/cryptid/gameset.lua b/compat/cryptid/gameset.lua deleted file mode 100644 index 1382f24f..00000000 --- a/compat/cryptid/gameset.lua +++ /dev/null @@ -1,209 +0,0 @@ -G.FUNCS.cry_intro_part = function(_part) - local step = 1 - G.SETTINGS.paused = true - if _part == "start" then - G.gateway = Sprite( - G.ROOM_ATTACH.T.x + G.ROOM_ATTACH.T.w / 2 - 1, - G.ROOM_ATTACH.T.y + G.ROOM_ATTACH.T.h / 2 - 4, - G.CARD_W * 1.5, - G.CARD_H * 1.5, - G.ASSET_ATLAS["cry_atlasnotjokers"], - { x = 2, y = 0 } - ) - G.gateway.states.visible = false - G.gateway.states.collide.can = true - G.gateway.states.focus.can = false - G.gateway.states.hover.can = true - G.gateway.states.drag.can = false - G.gateway.hover = Node.hover - G.yawetag = Sprite( - G.ROOM_ATTACH.T.x + G.ROOM_ATTACH.T.w / 2 - 1, - G.ROOM_ATTACH.T.y + G.ROOM_ATTACH.T.h / 2 - 4, - G.CARD_W * 1.5, - G.CARD_H * 1.5, - G.ASSET_ATLAS["cry_atlasnotjokers"], - { x = 6, y = 5 } - ) - G.yawetag.states.visible = false - G.yawetag.states.collide.can = true - G.yawetag.states.focus.can = false - G.yawetag.states.hover.can = true - G.yawetag.states.drag.can = false - G.yawetag.hover = Node.hover - step = Cryptid.intro_info({ - text_key = "cry_intro_1", - attach = { major = G.ROOM_ATTACH, type = "cm", offset = { x = 0, y = 0 } }, - step = step, - }) - step = Cryptid.intro_info({ - text_key = "cry_intro_2", - attach = { major = G.ROOM_ATTACH, type = "cm", offset = { x = 0, y = -3 } }, - step = step, - }) - step = Cryptid.intro_info({ - text_key = "cry_intro_3", - attach = { major = G.ROOM_ATTACH, type = "cm", offset = { x = 0, y = -3 } }, - step = step, - highlight = { - G.gateway, - G.yawetag, - }, - on_start = function() - G.gateway.states.visible = true - G.gateway:set_alignment({ major = G.ROOM_ATTACH, type = "cm", offset = { x = -2.5, y = -3 } }) - G.yawetag.states.visible = true - G.yawetag:set_alignment({ major = G.ROOM_ATTACH, type = "cm", offset = { x = 2.5, y = -3 } }) - end, - }) - step = Cryptid.intro_info({ - text_key = "cry_intro_4", - attach = { major = G.ROOM_ATTACH, type = "cm", offset = { x = 0, y = -3 } }, - step = step, - highlight = { - G.gateway, - G.yawetag, - }, - }) - local modestSprite = Sprite(0, 0, 1, 1, G.ASSET_ATLAS["cry_gameset"], { x = 0, y = 0 }) - modestSprite:define_draw_steps({ - { shader = "dissolve", shadow_height = 0.05 }, - { shader = "dissolve" }, - }) - local mainlineSprite = Sprite(0, 0, 1, 1, G.ASSET_ATLAS["cry_gameset"], { x = 1, y = 0 }) - mainlineSprite:define_draw_steps({ - { shader = "dissolve", shadow_height = 0.05 }, - { shader = "dissolve" }, - }) - if Cryptid_config and Cryptid_config.madness_enabled then - local madnessSprite = Sprite(0, 0, 1, 1, G.ASSET_ATLAS["cry_gameset"], { x = 2, y = 0 }) - madnessSprite:define_draw_steps({ - { shader = "dissolve", shadow_height = 0.05 }, - { shader = "dissolve" }, - }) - end - --TODO: localize - G.modestBtn = create_UIBox_character_button_with_sprite({ - sprite = modestSprite, - button = localize("entr_gameset_modest"), - id = "modest", - func = "cry_modest", - colour = G.C.GREEN, - maxw = 3, - }) - G.mainlineBtn = create_UIBox_character_button_with_sprite({ - sprite = mainlineSprite, - button = localize("entr_gameset_mainline"), - id = "mainline", - func = "cry_mainline", - colour = G.C.RED, - maxw = 3, - }) - if Cryptid_config and Cryptid_config.madness_enabled then - G.madnessBtn = create_UIBox_character_button_with_sprite({ - sprite = madnessSprite, - button = localize("entr_gameset_madness"), - id = "madness", - func = "cry_madness", - colour = Entropy.entropic_gradient, - maxw = 3, - }) - end - local gamesetUI = create_UIBox_generic_options({ - infotip = false, - contents = { - G.modestBtn, - G.mainlineBtn, - Cryptid_config and Cryptid_config.madness_enabled and G.madnessBtn or {}, - }, - back_label = "Confirm", - back_colour = G.C.BLUE, - back_func = "cry_gameset_confirm", - }) - G.E_MANAGER:add_event(Event({ - trigger = "after", - blocking = false, - blockable = false, - func = function() - if G.madnessBtn then G.madnessBtn.config.colour = Entropy.entropic_gradient end - return true - end, - })) - gamesetUI.nodes[2] = nil - gamesetUI.config.colour = G.C.CLEAR - G.gamesetUI = UIBox({ - definition = gamesetUI, - config = { major = G.ROOM_ATTACH, type = "cm", offset = { x = 0, y = 2.5 } }, - }) - G.gamesetUI.states.visible = false - step = Cryptid.intro_info({ - text_key = "cry_intro_5", - attach = { major = G.ROOM_ATTACH, type = "cm", offset = { x = 0, y = -3 } }, - step = step, - highlight = { - G.gateway, - G.yawetag, - G.gamesetUI, - }, - on_start = function() - --the scaling should be eased later... - G.gamesetUI.states.visible = true - G.gateway:set_alignment({ major = G.ROOM_ATTACH, type = "cm", offset = { x = -4.5, y = 2.2 } }) - G.gateway.T.w = G.gateway.T.w * 3 - G.gateway.T.h = G.gateway.T.h * 3 - G.yawetag:set_alignment({ major = G.ROOM_ATTACH, type = "cm", offset = { x = 4.5, y = 2.2 } }) - G.yawetag.T.w = G.yawetag.T.w * 3 - G.yawetag.T.h = G.yawetag.T.h * 3 - end, - no_button = true, - }) - end - if _part == "modest" or _part == "mainline" or _part == "madness" then - local desc_length = { --number of times Jolly Joker speaks for each gameset - modest = 2, - mainline = 3, - madness = 4, - } - G.E_MANAGER:clear_queue("tutorial") - if G.OVERLAY_TUTORIAL.content then - G.OVERLAY_TUTORIAL.content:remove() - end - G.OVERLAY_TUTORIAL.Jimbo:remove_button() - G.OVERLAY_TUTORIAL.Jimbo:remove_speech_bubble() - G.OVERLAY_TUTORIAL.step = nil - for i = 1, desc_length[_part] do - step = Cryptid.intro_info({ - text_key = "cry_" .. _part .. "_" .. i, - attach = { major = G.ROOM_ATTACH, type = "cm", offset = { x = 0, y = -3 } }, - step = step, - highlight = { - G.gamesetUI:get_UIE_by_ID(_part), - }, - }) - end - step = Cryptid.intro_info({ - no_button = true, - attach = { major = G.ROOM_ATTACH, type = "cm", offset = { x = 0, y = -3 } }, - step = step, - highlight = { - G.gateway, - G.yawetag, - G.gamesetUI, - }, - }) - end -end - -G.FUNCS.cry_modest = function(e) - G.modestBtn.config.colour = G.C.CRY_SELECTED - G.mainlineBtn.config.colour = G.C.RED - if G.madnessBtn then G.madnessBtn.config.colour = Entropy.entropic_gradient end - G.FUNCS.cry_intro_part("modest") - G.selectedGameset = "modest" -end -G.FUNCS.cry_mainline = function(e) - G.modestBtn.config.colour = G.C.GREEN - G.mainlineBtn.config.colour = G.C.CRY_SELECTED - if G.madnessBtn then G.madnessBtn.config.colour = Entropy.entropic_gradient end - G.FUNCS.cry_intro_part("mainline") - G.selectedGameset = "mainline" -end diff --git a/compat/grabbag.lua b/compat/grabbag.lua index 51c1a275..7e641000 100644 --- a/compat/grabbag.lua +++ b/compat/grabbag.lua @@ -717,7 +717,7 @@ if (SMODS.Mods["GrabBag"] or {}).can_load then }, object_type = "Consumable", order = 3014, - key = "decay", + key = "gbdecay", set = "Transient", inversion = "c_gb_rust", atlas = "crossmod_consumables", diff --git a/items/altpath/blinds.lua b/items/altpath/blinds.lua index b6d4a551..289e3f9f 100644 --- a/items/altpath/blinds.lua +++ b/items/altpath/blinds.lua @@ -1287,6 +1287,7 @@ local omega = { func = function() G.GAME.blind.chips = G.GAME.blind.chips * 2 G.GAME.blind:juice_up() + G.GAME.blind.chip_text = number_format(G.GAME.blind.chips) G.HUD_blind:recalculate() return true end diff --git a/items/misc/runes.lua b/items/misc/runes.lua index bbf7ec42..baf94c52 100644 --- a/items/misc/runes.lua +++ b/items/misc/runes.lua @@ -216,7 +216,7 @@ function add_rune(_tag, no_copy) }}, config = { align = G.HUD_runes[1] and 'bm' or 'tri', - offset = G.HUD_runes[1] and {x=0,y=0} or {x=1.7,y=0}, + offset = G.HUD_runes[1] and {x=0,y=0} or {x=1,y=0}, major = G.HUD_runes[1] and G.HUD_runes[#G.HUD_runes] or G.ROOM_ATTACH} } discover_card(G.P_RUNES[_tag.key]) @@ -230,9 +230,9 @@ function add_rune(_tag, no_copy) _tag.HUD_rune = G.HUD_runes[#G.HUD_runes] _tag.HUD_tag = _tag.HUD_rune _tag.is_rune = true - if #G.HUD_runes > 13 then + if #G.HUD_runes > 6 then for i = 2, #G.HUD_runes do - G.HUD_runes[i].config.offset.y = -0.9 + 0.9 * (13 / #G.HUD_runes) + G.HUD_runes[i].config.offset.y = -0.9 + 0.9 * (6 / #G.HUD_runes) end end if G.P_RUNES[_tag.key] and G.P_RUNES[_tag.key].add_to_deck then @@ -282,12 +282,32 @@ function Tag:rune_remove() end self.HUD_rune:remove() - if #G.HUD_runes >= 13 then + if #G.HUD_runes >= 6 then for i = 2, #G.HUD_runes do - G.HUD_runes[i].config.offset.y = -0.9 + 0.9 * 13 / #G.HUD_runes + G.HUD_runes[i].config.offset.y = -0.9 + 0.9 * 6 / #G.HUD_runes end end end +local at = add_tag +function add_tag(tag, from_skip, no_copy) + at(tag) + if #G.HUD_tags > 6 then + for i = 2, #G.HUD_tags do + G.HUD_tags[i].config.offset.y = 0.9 - 0.9 * 6 / #G.HUD_tags + end + end +end + +local tr = Tag.remove +function Tag:remove() + tr(self) + if #G.HUD_tags >= 6 then + for i = 2, #G.HUD_tags do + G.HUD_tags[i].config.offset.y = 0.9 - 0.9 * 6 / #G.HUD_tags + end + end +end + function Tag:remove_rune_from_game() local tag_key = nil for k, v in pairs(G.GAME.runes) do diff --git a/localization/en-us.lua b/localization/en-us.lua index 31843944..38785135 100644 --- a/localization/en-us.lua +++ b/localization/en-us.lua @@ -3164,7 +3164,7 @@ local decs = { "Then randomize them" } }, - c_entr_decay = { + c_entr_gbdecay = { name = "Decay", text = { "Apply {C:attention}Temporary{} to",