Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion compat/cryptid.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
209 changes: 0 additions & 209 deletions compat/cryptid/gameset.lua

This file was deleted.

2 changes: 1 addition & 1 deletion compat/grabbag.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions items/altpath/blinds.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 25 additions & 5 deletions items/misc/runes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion localization/en-us.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3164,7 +3164,7 @@ local decs = {
"Then randomize them"
}
},
c_entr_decay = {
c_entr_gbdecay = {
name = "Decay",
text = {
"Apply {C:attention}Temporary{} to",
Expand Down