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
29 changes: 28 additions & 1 deletion compat/cryptid.lua
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ local containment = {
return true
end
}))
else
G.GAME.entropy = 0
end
end,
calculate = function(self,back,context)
Expand Down Expand Up @@ -282,6 +284,31 @@ elseif (SMODS.Mods["vallkarri"] or {}).can_load then
return {
items = items
}
elseif (SMODS.Mods["MyDreamJournal"] or {}).can_load then
Entropy.MDJOverCryptid = true
local files = {
"compat/cryptid/entropic_jokers",
"compat/cryptid/epic_jokers",
"compat/cryptid/exotic_jokers",
}
local items = Entropy.collect_files(files)
G.FUNCS.cry_asc_UI_set = function(e)
e.config.object.colours = { G.C.GOLD }
e.config.object:update_text()
end
-- Needed because get_poker_hand_info isnt called at the end of the road
local evaluateroundref = G.FUNCS.evaluate_round
function G.FUNCS.evaluate_round()
evaluateroundref()
-- This is just the easiest way to check if its gold because lua is annoying
if G.C.UI_CHIPS[1] == G.C.GOLD[1] then
ease_colour(G.C.UI_CHIPS, G.C.BLUE, 0.3)
ease_colour(G.C.UI_MULT, G.C.RED, 0.3)
end
end
return {
items = items
}
else
G.FUNCS.cry_asc_UI_set = function(e)
e.config.object.colours = { G.C.GOLD }
Expand All @@ -297,4 +324,4 @@ else
ease_colour(G.C.UI_MULT, G.C.RED, 0.3)
end
end
end
end
4 changes: 2 additions & 2 deletions compat/cryptid/entropic_jokers.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1000,9 +1000,9 @@ local heimartai = {
return {
items = {
epitachyno,
not Entropy.ValkarriOverCryptid and helios or nil,
( not Entropy.ValkarriOverCryptid or not Entropy.MDJOverCryptid ) and helios or nil,
xekanos,
not Entropy.ValkarriOverCryptid and dekatria or nil,
( not Entropy.ValkarriOverCryptid or not Entropy.MDJOverCryptid ) and dekatria or nil,
anaptyxi,
parakmi,
exousia,
Expand Down
10 changes: 5 additions & 5 deletions compat/cryptid/epic_jokers.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
local rarity = Entropy.ValkarriOverCryptid and "valk_renowned" or "cry_epic"
local set = Entropy.ValkarriOverCryptid and "set_entr_misc_jokers" or "set_cry_epic"
local rarity = Entropy.ValkarriOverCryptid and "valk_renowned" or Entropy.MDJOverCryptid and "MDJ_veryrare" or "cry_epic"
local set = ( Entropy.ValkarriOverCryptid or Entropy.MDJOverCryptid ) and "set_entr_misc_jokers" or "set_cry_epic"

local burnt_m = {
order = 250,
Expand Down Expand Up @@ -565,15 +565,15 @@ local caviar = {

return {
items = {
not Entropy.ValkarriOverCryptid and burnt_m or nil,
( not Entropy.ValkarriOverCryptid or not Entropy.MDJOverCryptid ) and burnt_m or nil,
chaos,
dni,
not Entropy.ValkarriOverCryptid and trapezium or nil,
( not Entropy.ValkarriOverCryptid or not Entropy.MDJOverCryptid ) and trapezium or nil,
antireal,
jokezmann_brain,
metanoia,
metamorphosis,
nyctophobia,
caviar
}
}
}
6 changes: 3 additions & 3 deletions compat/cryptid/exotic_jokers.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
local rarity = Entropy.ValkarriOverCryptid and "valk_exquisite" or "cry_exotic"
local set = Entropy.ValkarriOverCryptid and "set_entr_misc_jokers" or "set_cry_exotic"
local rarity = Entropy.ValkarriOverCryptid and "valk_exquisite" or Entropy.MDJOverCryptid and "MDJ_unlegendary" or "cry_epic"
local set = ( Entropy.ValkarriOverCryptid or Entropy.MDJOverCryptid ) and "set_entr_misc_jokers" or "set_cry_epic"

local stillicidium = {
order = 500,
Expand Down Expand Up @@ -371,4 +371,4 @@ return {
scorpio,
not Entropy.ValkarriOverCryptid and ridiculus_absens or nil
}
}
}