Skip to content

Merge Visual Changes from Dev #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lord-ruby merged 4 commits into from
Aug 27, 2025
Merged

Merge Visual Changes from Dev #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee54ec0
fix bug with omega display
lord-ruby Aug 27, 2025
c43aaa3
fix ascension display fully
lord-ruby Aug 27, 2025
1175e21
clean up
lord-ruby Aug 27, 2025
8f24a96
update depdendencies
lord-ruby Aug 27, 2025
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: 1 addition & 0 deletions items/altpath/blinds.lua
View file
Open in desktop
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.HUD_blind:recalculate()
return true
end
}))
Expand Down
16 changes: 1 addition & 15 deletions items/inversions/reverse_runes.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,22 +845,8 @@ G.FUNCS.play_cards_from_highlighted = function(e)
if text == "entr_derivative" and next(SMODS.find_card("j_entr_antiderivative")) then
check_for_unlock({type = "anti_derivative"})
end
G.GAME.asc_power_hand = 0
play_ref(e)
G.E_MANAGER:add_event(Event{
trigger = "after",
blocking = false,
func = function()
G.E_MANAGER:add_event(Event{
trigger = "after",
blocking = false,
func = function()
G.GAME.asc_power_hand = 0
return true
end
})
return true
end
})
end

local strength_indicator = Entropy.create_mark("strength", 7065, {x = 0, y = 6})
Expand Down
3 changes: 1 addition & 2 deletions lib/config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,5 +243,4 @@ local entropyTabs = function()
},
}
end
SMODS.current_mod.extra_tabs = entropyTabs
SMODS.scale_card = SMODS.scale_card or function() end
SMODS.current_mod.extra_tabs = entropyTabs
14 changes: 13 additions & 1 deletion lib/fixes.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,4 +401,16 @@ SMODS.Booster:take_ownership("p_cry_code_mega_1", {
end
return create_card("Code", G.pack_cards, nil, nil, true, true, nil, "cry_program_1")
end
}, true)
}, true)

local mod_mult_ref = mod_mult
function mod_mult(_mult)
if _mult then return mod_mult_ref(_mult) end
return 1
end

local mod_chips_ref = mod_chips
function mod_chips(_chips)
if _chips then return mod_mult_ref(_chips) end
return 1
end
39 changes: 20 additions & 19 deletions lib/hooks.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ function end_round()
end
G.E_MANAGER:add_event(Event({
trigger = 'immediate',
func = (function() G.GAME.current_round.current_hand.cry_asc_num = 0;G.GAME.current_round.current_hand.cry_asc_num_text = '';return true end)
func = (function() G.GAME.asc_power_hand = 0; G.GAME.current_round.current_hand.cry_asc_num = 0;G.GAME.current_round.current_hand.cry_asc_num_text = '';return true end)
}))
end

Expand Down Expand Up @@ -1294,9 +1294,10 @@ function SMODS.calculate_individual_effect(effect, scored_card, key, amount, fro
local orig = to_big((G.GAME.asc_power_hand or 0) + G.GAME.current_round.current_hand.cry_asc_num)
G.GAME.asc_power_hand = to_big((G.GAME.asc_power_hand or 1) + G.GAME.current_round.current_hand.cry_asc_num) * to_big(amount)
if G.GAME.current_round.current_hand.cry_asc_num == 0 then G.GAME.current_round.current_hand.cry_asc_num = 1 end
local text = G.GAME.asc_power_hand
G.E_MANAGER:add_event(Event({
func = function()
G.GAME.current_round.current_hand.cry_asc_num_text = (to_big(G.GAME.asc_power_hand) < to_big(0) and " (" or " (+") .. (to_big(G.GAME.asc_power_hand)) .. ")"
G.GAME.current_round.current_hand.cry_asc_num_text = (to_big(text) < to_big(0) and " (" or " (+") .. (to_big(text)) .. ")"
return true
end
}))
Expand All @@ -1313,9 +1314,10 @@ function SMODS.calculate_individual_effect(effect, scored_card, key, amount, fro
local e = card_eval_status_text
local orig = to_big((G.GAME.asc_power_hand or 0) + G.GAME.current_round.current_hand.cry_asc_num)
G.GAME.asc_power_hand = to_big((G.GAME.asc_power_hand or 0) + G.GAME.current_round.current_hand.cry_asc_num) + to_big(amount)
local text = G.GAME.asc_power_hand
G.E_MANAGER:add_event(Event({
func = function()
G.GAME.current_round.current_hand.cry_asc_num_text = (to_big(G.GAME.asc_power_hand) < to_big(0) and " (" or " (+") .. (to_big(G.GAME.asc_power_hand)) .. ")"
G.GAME.current_round.current_hand.cry_asc_num_text = (to_big(text) < to_big(0) and " (" or " (+") .. (to_big(text)) .. ")"
return true
end
}))
Expand All @@ -1332,14 +1334,13 @@ function SMODS.calculate_individual_effect(effect, scored_card, key, amount, fro
local e = card_eval_status_text
local orig = to_big((G.GAME.asc_power_hand or 0) + G.GAME.current_round.current_hand.cry_asc_num)
G.GAME.asc_power_hand = to_big((G.GAME.asc_power_hand or 0) + G.GAME.current_round.current_hand.cry_asc_num) ^ to_big(amount)
if G.GAME.asc_power_hand ~= 0 then
G.E_MANAGER:add_event(Event({
func = function()
G.GAME.current_round.current_hand.cry_asc_num_text = (to_big(G.GAME.asc_power_hand) < to_big(0) and " (" or " (+") .. (to_big(G.GAME.asc_power_hand)) .. ")"
return true
end
}))
end
local text = G.GAME.asc_power_hand
G.E_MANAGER:add_event(Event({
func = function()
G.GAME.current_round.current_hand.cry_asc_num_text = (to_big(text) < to_big(0) and " (" or " (+") .. (to_big(text)) .. ")"
return true
end
}))
card_eval_status_text = function() end
scie(effect, scored_card, "Xmult_mod", Cryptid.ascend(1, G.GAME.asc_power_hand - orig), false)
scie(effect, scored_card, "Xchip_mod", Cryptid.ascend(1, G.GAME.asc_power_hand - orig), false)
Expand All @@ -1353,14 +1354,13 @@ function SMODS.calculate_individual_effect(effect, scored_card, key, amount, fro
local e = card_eval_status_text
local orig = to_big((G.GAME.asc_power_hand or 0) + G.GAME.current_round.current_hand.cry_asc_num)
G.GAME.asc_power_hand = to_big((G.GAME.asc_power_hand or 0) + G.GAME.current_round.current_hand.cry_asc_num):arrow(amount[1], amount[2])
if G.GAME.asc_power_hand ~= 0 then
G.E_MANAGER:add_event(Event({
func = function()
G.GAME.current_round.current_hand.cry_asc_num_text = (to_big(G.GAME.asc_power_hand) < to_big(0) and " (" or " (+") .. (to_big(G.GAME.asc_power_hand)) .. ")"
return true
end
}))
end
local text = G.GAME.asc_power_hand
G.E_MANAGER:add_event(Event({
func = function()
G.GAME.current_round.current_hand.cry_asc_num_text = (to_big(text) < to_big(0) and " (" or " (+") .. (to_big(text)) .. ")"
return true
end
}))
card_eval_status_text = function() end
scie(effect, scored_card, "Xmult_mod", Cryptid.ascend(1, G.GAME.asc_power_hand - orig), false)
scie(effect, scored_card, "Xchip_mod", Cryptid.ascend(1, G.GAME.asc_power_hand - orig), false)
Expand Down Expand Up @@ -3354,6 +3354,7 @@ end

local parse_ref = CardArea.parse_highlighted
function CardArea:parse_highlighted()
G.GAME.asc_power_hand = 0
parse_ref(self)
local text,disp_text,poker_hands = G.FUNCS.get_poker_hand_info(self.highlighted)
if G.GAME.hands[text] and G.GAME.hands[text].operator then
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"priority": 666,
"badge_colour": "FE0001",
"dependencies": [
"Steamodded",
"Steamodded (>=1.0.0~BETA-0827)",
"Cryptlib"
],
"conflicts": [
Expand Down