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
28 changes: 14 additions & 14 deletions Entropy.lua
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ local i = {
"hidden",
"fixes",
"stake",
"tags",
"compat/loader"
--"glop"
}
Expand DownExpand Up@@ -544,7 +545,7 @@ function SMODS.create_mod_badges(obj, badges)
local scale_fac = calced_text_width > max_text_width and max_text_width / calced_text_width or 1
return scale_fac
end
if obj.entr_credits.art or obj.entr_credits.code or obj.entr_credits.idea then
if obj.entr_credits.art or obj.entr_credits.code or obj.entr_credits.idea or obj.entr_credits.custom then
local scale_fac = {}
local min_scale_fac = 1
local strings = { "Entropy" }
Expand All@@ -556,6 +557,9 @@ function SMODS.create_mod_badges(obj, badges)
end
end
end
if obj.entr_credits.custom then
strings[#strings + 1] = localize({ type="variable", key = obj.entr_credits.custom.key, vars = { obj.entr_credits.custom.text } })
end
for i = 1, #strings do
scale_fac[i] = calc_scale_fac(strings[i])
min_scale_fac = math.min(min_scale_fac, scale_fac[i])
Expand DownExpand Up@@ -651,24 +655,20 @@ function Controller:key_press_update(key, dt)
G.CHOOSE_CARD:align_to_major()
end
end



SMODS.Sound({
key = "music_entropic",
path = "music_entropic.ogg",
key = "music_zenith",
path = "music_zenith.ogg",
select_music_track = function()
return Cryptid_config.Cryptid
and Cryptid_config.Cryptid.exotic_music and not G.GAME.Ruby
and #Cryptid.advanced_find_joker(nil, "entr_hyper_exotic", nil, nil, true) ~= 0 and 1^200
return G.GAME.Ruby and 10^300
end,
})

SMODS.Sound({
key = "music_zenith",
path = "music_zenith.ogg",
key = "music_entropic",
path = "music_entropic.ogg",
select_music_track = function()
return G.GAME.Ruby and 10^300
return Entropy.config
and Entropy.config.entropic_music
and #Cryptid.advanced_find_joker(nil, "entr_hyper_exotic", nil, nil, true) ~= 0 and 10^200
end,
})
SMODS.Sound({
Expand DownExpand Up@@ -718,4 +718,4 @@ local entrConfigTab = function()
}
end

SMODS.current_mod.config_tab = entrConfigTab
SMODS.current_mod.config_tab = entrConfigTab
Binary file modifiedassets/1x/decks.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedassets/1x/other_consumables.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedassets/1x/stickers.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedassets/1x/tags.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedassets/2x/decks.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedassets/2x/other_consumables.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedassets/2x/stickers.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedassets/2x/tags.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedassets/sounds/woof1.ogg
Binary file not shown.
Binary file addedassets/sounds/woof2.ogg
Binary file not shown.
Binary file addedassets/sounds/woof3.ogg
Binary file not shown.
15 changes: 14 additions & 1 deletion compat/loader.lua
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,20 @@ function SMODS.injectItems()
LoadCompatibilities()
Deobfuscate()
loadmodsref()
for i, v in pairs(Entropy.FlipsideInversions) do Entropy.FlipsideInversions[v] = i end
Entropy.FlipsidePureInversions = copy_table(Entropy.FlipsideInversions)
SMODS.ObjectType({
key = "Twisted",
default = "j_entr_memory_leak",
cards = {},
inject = function(self)
SMODS.ObjectType.inject(self)
for i, v in pairs(Entropy.FlipsidePureInversions) do
self:inject_card(G.P_CENTERS[v])
end
end,
})
SMODS.ObjectTypes.Twisted:inject()
Entropy.ReverseFlipsideInversions()
end


Expand Down
62 changes: 2 additions & 60 deletions consumable.lua
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,4 @@
SMODS.Atlas { key = 'miscc', path = 'other_consumables.png', px = 71, py = 95 }
SMODS.Consumable({
key = "beyond",
set = "RSpectral",
unlocked = true,
discovered = true,
atlas = "miscc",
config = {

},
name = "entr-Beyond",
soul_rate = 0, --probably only obtainable from flipsiding a gateway
hidden = true,
--soul_pos = { x = 2, y = 0, extra = { x = 1, y = 0 } },
use = function(self, card, area, copier)
if not G.GAME.banned_keys then
G.GAME.banned_keys = {}
end
for i, v in pairs(G.jokers.cards) do
G.GAME.banned_keys[v.config.center.key] = true
G.E_MANAGER:add_event(Event({
trigger = "before",
delay = 0.75,
func = function()
if v.config.center.rarity == "cry_exotic" then
check_for_unlock({ type = "what_have_you_done" })
end
v:start_dissolve(nil, _first_dissolve)
return true
end,
}))
end
G.E_MANAGER:add_event(Event({
trigger = "after",
delay = 0.4,
func = function()
play_sound("timpani")
local card = create_card("Joker", G.jokers, nil, "entr_hyper_exotic", nil, nil, nil, "entr_beyond")
card:add_to_deck()
G.jokers:emplace(card)
card:juice_up(0.3, 0.5)
return true
end,
}))
delay(0.6)
end,
can_use = function(self, card)
return true
end,
loc_vars = function(self, q, card)
return {
vars = {
colours = {
{2,2,2,2}
}
}
}
end
})

Entropy.FlipsideInversions = {
--spectrals
Expand All@@ -65,6 +7,8 @@ Entropy.FlipsideInversions = {
--tarots
--["c_fool"] = "c_entr_fool",
--planets
["c_cry_white_hole"] = "c_entr_pulsar",
["c_black_hole"] = "c_entr_quasar",
--code
["c_cry_crash"] = "c_entr_memory_leak",
["c_cry_payload"] = "c_entr_root_kit",
Expand DownExpand Up@@ -92,8 +36,6 @@ Entropy.FlipsideInversions = {
["c_cry_reboot"] = "c_entr_bootstrap",
["c_cry_pointer"] = "c_entr_define"
}
Entropy.FlipsidePureInversions = copy_table(Entropy.FlipsideInversions)
Entropy.ReverseFlipsideInversions()
SMODS.Consumable({
key = "flipside",
set = "Spectral",
Expand Down
Loading