Skip to content

Commit 0476ca3

Browse files
committed
hopefully fix hand level stuff
1 parent 51c3c61 commit 0476ca3

File tree

7 files changed

+19
-7
lines changed

7 files changed

+19
-7
lines changed

Entropy.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Cryptid.mod_gameset_whitelist["entr"] = true
7878
Cryptid.mod_gameset_whitelist["Entropy"] = true
7979

8080

81-
Cryptid.pointerblistifytype("rarity", "entr_hyper_exotic")
81+
Cryptid.pointerblistifytype("rarity", "entr_entropic")
8282
Cryptid.pointerblistifytype("rarity", "entr_zenith")
8383
Cryptid.pointerblistify("c_entr_define")
8484
for i, v in pairs(G.P_BLINDS) do

items/inversions/reverse_codes.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ local pseudorandom = {
344344
["shop_vouchers"]=true
345345
}
346346
for i, v in pairs(allowed) do
347-
for ind, card in pairs(G[i].cards) do
347+
for ind, card in pairs(G[i] and G[i].cards or {}) do
348348
Entropy.ApplySticker(card, "entr_pseudorandom")
349349
end
350350
end

items/inversions/reverse_spectrals.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1086,7 +1086,7 @@ local evocation = {
10861086
card:remove_from_deck()
10871087
card:start_dissolve()
10881088
local rare = nil
1089-
if card.config.center.rarity ~= "j_entr_hyper_exotic" then
1089+
if card.config.center.rarity ~= "j_entr_entropic" then
10901090
rare = Entropy.GetNextRarity(card.config.center.rarity or 1) or card.config.center.rarity
10911091
end
10921092
if rare == 1 then rare = "Common" end

items/misc/sounds.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SMODS.Sound({
1111
select_music_track = function()
1212
return Entropy.config
1313
and Entropy.config.entropic_music
14-
and #Cryptid.advanced_find_joker(nil, "entr_hyper_exotic", nil, nil, true) ~= 0 and 10^200
14+
and #Cryptid.advanced_find_joker(nil, "entr_entropic", nil, nil, true) ~= 0 and 10^200
1515
end,
1616
})
1717
SMODS.Sound({

items/misc/tags.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ SMODS.Atlas {
9898
local epic = Entropy.RareTag("cry_epic", "epic", true, "cry_epic", {x=1,y=0}, 0, nil,4)
9999
local legendary = Entropy.RareTag(4, "legendary", true, "Legendary", {x=2,y=0}, 0, true,5)
100100
local exotic = Entropy.RareTag("cry_exotic", "exotic", true, "cry_exotic", {x=3,y=0}, 0, nil,6)
101-
local entropic = Entropy.RareTag("entr_hyper_exotic", "entropic", true, "entr_hyper_exotic", {x=4,y=0}, 0, nil,7)
101+
local entropic = Entropy.RareTag("entr_entropic", "entropic", true, "entr_entropic", {x=4,y=0}, 0, nil,7)
102102

103103
local copying = {
104104
object_type = "Tag",

lib/hooks.lua

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,7 +1227,19 @@ function level_up_hand(card, hand, instant, amount)
12271227
if Entropy.HasJoker("j_entr_strawberry_pie",true) and hand ~= "High Card" then
12281228
hand = "High Card"
12291229
end
1230+
local mult = G.GAME.hands[hand].mult
1231+
local chips = G.GAME.hands[hand].chips
12301232
ref(card,hand,instant,amount)
1233+
G.E_MANAGER:add_event(Event({func = function()
1234+
if G.GAME.hands[hand].chips == chips and G.GAME.hands[hand].l_chips ~= 0 then
1235+
G.GAME.hands[hand].chips = G.GAME.hands[hand].chips + G.GAME.hands[hand].l_chips
1236+
end
1237+
if G.GAME.hands[hand].mult == mult and G.GAME.hands[hand].l_mult ~= 0 then
1238+
G.GAME.hands[hand].mult = G.GAME.hands[hand].mult + G.GAME.hands[hand].l_mult
1239+
end
1240+
return true
1241+
end
1242+
}))
12311243
end
12321244

12331245
local start_dissolveref = Card.start_dissolve

lovely/core.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Entropy.RarityPoints = {
5959
["cry_epic"] = 60,
6060
[4] = 300, --legendary
6161
["cry_exotic"] = 1000,
62-
["entr_hyper_exotic"] = 5000,
62+
["entr_entropic"] = 5000,
6363
}
6464
--higher rarities give less points so the diminisher is used in division
6565
Entropy.RarityDiminishers = {
@@ -69,7 +69,7 @@ Entropy.RarityDiminishers = {
6969
[4] = 5,
7070
["cry_epic"] = 4,
7171
["cry_exotic"] = 10,
72-
["entr_hyper_exotic"] = 15
72+
["entr_entropic"] = 15
7373
}
7474
Entropy.EditionFactors = {
7575
["e_foil"] = 1.25,

0 commit comments

Comments
 (0)