Skip to content

Commit 44ac7c4

Browse files
Combine hooks
still a lot of cleanup left with these xd. Still a bunch of hooks scattered everywhere aieeeee
1 parent 20b8fde commit 44ac7c4

File tree

2 files changed

+15
-23
lines changed

2 files changed

+15
-23
lines changed

items/code.lua

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,27 +1035,6 @@ local semicolon = {
10351035
"other"
10361036
)
10371037
end,
1038-
init = function(self)
1039-
--don't evaluate round
1040-
local gfer = G.FUNCS.evaluate_round
1041-
function G.FUNCS.evaluate_round()
1042-
if G.GAME.current_round.semicolon then
1043-
add_round_eval_row({ dollars = 0, name = "blind1", pitch = 0.95, saved = true })
1044-
G.E_MANAGER:add_event(Event({
1045-
trigger = "before",
1046-
delay = 1.3 * math.min(G.GAME.blind.dollars + 2, 7) / 2 * 0.15 + 0.5,
1047-
func = function()
1048-
G.GAME.blind:defeat()
1049-
return true
1050-
end,
1051-
}))
1052-
delay(0.2)
1053-
add_round_eval_row({ name = "bottom", dollars = 0 })
1054-
else
1055-
return gfer()
1056-
end
1057-
end
1058-
end,
10591038
}
10601039
local malware = {
10611040
cry_credits = {

lib/modifiers.lua

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,11 +382,24 @@ function cry_best_interest_cap()
382382
end
383383
return best
384384
end
385-
386385
local evaluateroundref = G.FUNCS.evaluate_round
387386
G.FUNCS.evaluate_round = function()
388387
G.GAME.interest_cap = cry_best_interest_cap() -- blehhhhhh
389-
evaluateroundref()
388+
if G.GAME.current_round.semicolon then
389+
add_round_eval_row({ dollars = 0, name = "blind1", pitch = 0.95, saved = true })
390+
G.E_MANAGER:add_event(Event({
391+
trigger = "before",
392+
delay = 1.3 * math.min(G.GAME.blind.dollars + 2, 7) / 2 * 0.15 + 0.5,
393+
func = function()
394+
G.GAME.blind:defeat()
395+
return true
396+
end,
397+
}))
398+
delay(0.2)
399+
add_round_eval_row({ name = "bottom", dollars = 0 })
400+
else
401+
return evaluateroundref()
402+
end
390403
end
391404
function Cryptid.edition_to_table(edition) -- look mom i figured it out (this does NOT need to be a function)
392405
if edition then

0 commit comments

Comments
 (0)