Skip to content

Commit d0264fd

Browse files
lord-rubylord-ruby
committed
fix sound issues
1 parent 2b63c80 commit d0264fd

File tree

8 files changed

+53
-170
lines changed

8 files changed

+53
-170
lines changed

‎items/deck.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ local critical = {
483483
delay(0.6)
484484
if check then
485485
return {
486-
Emult_mod = check,
486+
e_mult = check,
487487
colour = G.C.DARK_EDITION,
488488
}
489489
end

‎items/epic.lua‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1709,8 +1709,8 @@ local goldjoker = {
17091709
key = "goldjoker",
17101710
config = {
17111711
extra = {
1712-
percent_mod = 2,
1713-
percent = 10,
1712+
percent_mod = 5,
1713+
percent = 20,
17141714
},
17151715
},
17161716
dependencies = {
@@ -1785,7 +1785,7 @@ local altgoogol = {
17851785
key = "altgoogol",
17861786
config = {
17871787
extra = {
1788-
Xmult = 12,
1788+
Xmult = 25,
17891789
odds = 8,
17901790
},
17911791
},
@@ -2523,15 +2523,7 @@ local starfruit = {
25232523
calculate = function(self, card, context)
25242524
if context.joker_main or context.forcetrigger then
25252525
return {
2526-
message = localize({
2527-
type = "variable",
2528-
key = "a_powmult",
2529-
vars = {
2530-
number_format(card.ability.emult),
2531-
},
2532-
}),
2533-
Emult_mod = lenient_bignum(card.ability.emult),
2534-
colour = G.C.DARK_EDITION,
2526+
e_mult = lenient_bignum(card.ability.emult),
25352527
}
25362528
end
25372529
if context.reroll_shop or context.forcetrigger then

‎items/exotic.lua‎

Lines changed: 15 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ local exponentia = {
294294
object_type = "Joker",
295295
name = "cry-Exponentia",
296296
key = "exponentia",
297-
config = { extra = { Emult = 1, Emult_mod = 0.03 } },
297+
config = { extra = { Emult = 1, e_mult = 0.03 } },
298298
pos = { x = 0, y = 0 },
299299
rarity = "cry_exotic",
300300
cost = 50,
@@ -307,29 +307,13 @@ local exponentia = {
307307
calculate = function(self, card, context)
308308
if context.joker_main and (to_big(card.ability.extra.Emult) > to_big(1)) then
309309
return {
310-
message = localize({
311-
type = "variable",
312-
key = "a_powmult",
313-
vars = {
314-
number_format(card.ability.extra.Emult),
315-
},
316-
}),
317-
Emult_mod = lenient_bignum(card.ability.extra.Emult),
318-
colour = G.C.DARK_EDITION,
310+
e_mult = lenient_bignum(card.ability.extra.Emult),
319311
}
320312
end
321313
if context.forcetrigger then
322314
card.ability.extra.Emult = card.ability.extra.Emult + card.ability.extra.Emult_mod
323315
return {
324-
message = localize({
325-
type = "variable",
326-
key = "a_powmult",
327-
vars = {
328-
number_format(card.ability.extra.Emult),
329-
},
330-
}),
331-
Emult_mod = lenient_bignum(card.ability.extra.Emult),
332-
colour = G.C.DARK_EDITION,
316+
e_mult = lenient_bignum(card.ability.extra.Emult),
333317
}
334318
end
335319
end,
@@ -371,6 +355,7 @@ local exponentia = {
371355
type = "variable",
372356
key = "a_powmult",
373357
vars = { number_format(v.ability.extra.Emult) },
358+
colour = G.C.DARK_EDITION,
374359
}),
375360
})
376361
Cryptid.apply_scale_mod(v, v.ability.extra.Emult_mod, old, v.ability.extra.Emult, {
@@ -755,15 +740,7 @@ local primus = {
755740
if context.joker_main and (to_big(card.ability.extra.Emult) > to_big(1)) then
756741
card.children.floating_sprite:set_sprite_pos({ x = 8, y = 6 })
757742
return {
758-
message = localize({
759-
type = "variable",
760-
key = "a_powmult",
761-
vars = {
762-
number_format(card.ability.extra.Emult),
763-
},
764-
}),
765-
Emult_mod = lenient_bignum(card.ability.extra.Emult),
766-
colour = G.C.DARK_EDITION,
743+
e_mult = lenient_bignum(card.ability.extra.Emult),
767744
}
768745
end
769746
if context.end_of_round then
@@ -772,15 +749,7 @@ local primus = {
772749
if context.forcetrigger then
773750
card.ability.extra.Emult = lenient_bignum(to_big(card.ability.extra.Emult) + card.ability.extra.Emult_mod)
774751
return {
775-
message = localize({
776-
type = "variable",
777-
key = "a_powmult",
778-
vars = {
779-
number_format(card.ability.extra.Emult),
780-
},
781-
}),
782-
Emult_mod = lenient_bignum(card.ability.extra.Emult),
783-
colour = G.C.DARK_EDITION,
752+
e_mult = lenient_bignum(card.ability.extra.Emult),
784753
}
785754
end
786755
end,
@@ -938,6 +907,7 @@ local stella_mortis = {
938907
vars = {
939908
number_format(lenient_bignum(card.ability.extra.Emult)),
940909
},
910+
colour = G.C.DARK_EDITION,
941911
}),
942912
})
943913
end
@@ -946,15 +916,7 @@ local stella_mortis = {
946916
end
947917
if (context.joker_main and (to_big(card.ability.extra.Emult) > to_big(1))) or context.forcetrigger then
948918
return {
949-
message = localize({
950-
type = "variable",
951-
key = "a_powmult",
952-
vars = {
953-
number_format(card.ability.extra.Emult),
954-
},
955-
}),
956-
Emult_mod = lenient_bignum(card.ability.extra.Emult),
957-
colour = G.C.DARK_EDITION,
919+
e_mult = lenient_bignum(card.ability.extra.Emult),
958920
}
959921
end
960922
end,
@@ -1021,12 +983,13 @@ local circulus_pistoris = {
1021983
pi = 2 * pi
1022984
end
1023985
return {
1024-
Echip_mod = pi,
1025-
Emult_mod = pi,
986+
e_chips = pi,
987+
e_mult = pi,
1026988
message = localize({
1027989
type = "variable",
1028990
key = "a_powmultchips",
1029991
vars = { (Cryptid.safe_get(card, "edition", "cry_oversat") and "tau" or "pi") },
992+
sound = "cry_echips"
1030993
}),
1031994
colour = { 0.8, 0.45, 0.85, 1 }, --plasma colors
1032995
}
@@ -1143,27 +1106,15 @@ local facile = {
11431106
if to_big(card.ability.immutable.check2) <= to_big(card.ability.extra.check) then
11441107
card.ability.immutable.check2 = 0
11451108
return {
1146-
message = localize({
1147-
type = "variable",
1148-
key = "a_powmult",
1149-
vars = { number_format(card.ability.extra.Emult) },
1150-
}),
1151-
Emult_mod = lenient_bignum(card.ability.extra.Emult),
1152-
colour = G.C.DARK_EDITION,
1109+
e_mult = lenient_bignum(card.ability.extra.Emult),
11531110
}
11541111
else
11551112
card.ability.immutable.check2 = 0
11561113
end
11571114
end
11581115
if context.forcetrigger then
11591116
return {
1160-
message = localize({
1161-
type = "variable",
1162-
key = "a_powmult",
1163-
vars = { number_format(card.ability.extra.Emult) },
1164-
}),
1165-
Emult_mod = lenient_bignum(card.ability.extra.Emult),
1166-
colour = G.C.DARK_EDITION,
1117+
e_mult = lenient_bignum(card.ability.extra.Emult),
11671118
}
11681119
end
11691120
end,
@@ -1626,15 +1577,7 @@ local formidiulosus = {
16261577
end
16271578
if context.cardarea == G.jokers and (to_big(card.ability.extra.Emult) > to_big(1)) and context.joker_main then
16281579
return {
1629-
message = localize({
1630-
type = "variable",
1631-
key = "a_powmult",
1632-
vars = {
1633-
number_format(card.ability.extra.Emult),
1634-
},
1635-
}),
1636-
Emult_mod = lenient_bignum(card.ability.extra.Emult),
1637-
colour = G.C.DARK_EDITION,
1580+
e_mult = lenient_bignum(card.ability.extra.Emult),
16381581
}
16391582
end
16401583
if context.forcetrigger then
@@ -1645,15 +1588,7 @@ local formidiulosus = {
16451588
G.jokers:emplace(card)
16461589
end
16471590
return {
1648-
message = localize({
1649-
type = "variable",
1650-
key = "a_powmult",
1651-
vars = {
1652-
number_format(card.ability.extra.Emult),
1653-
},
1654-
}),
1655-
Emult_mod = lenient_bignum(card.ability.extra.Emult),
1656-
colour = G.C.DARK_EDITION,
1591+
e_mult = lenient_bignum(card.ability.extra.Emult),
16571592
}
16581593
end
16591594
end,

‎items/m.lua‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1566,13 +1566,7 @@ local mprime = {
15661566
}))
15671567
end
15681568
return {
1569-
message = localize({
1570-
type = "variable",
1571-
key = "a_powmult",
1572-
vars = { number_format(card.ability.extra.mult) },
1573-
}),
1574-
Emult_mod = lenient_bignum(card.ability.extra.mult),
1575-
colour = G.C.DARK_EDITION,
1569+
e_mult = lenient_bignum(card.ability.extra.mult),
15761570
card = card,
15771571
}
15781572
end
@@ -1594,13 +1588,7 @@ local mprime = {
15941588
end,
15951589
}))
15961590
return {
1597-
message = localize({
1598-
type = "variable",
1599-
key = "a_powmult",
1600-
vars = { number_format(card.ability.extra.mult) },
1601-
}),
1602-
Emult_mod = lenient_bignum(card.ability.extra.mult),
1603-
colour = G.C.DARK_EDITION,
1591+
e_mult = lenient_bignum(card.ability.extra.mult),
16041592
}
16051593
end
16061594
end,

‎items/misc.lua‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -237,15 +237,7 @@ local abstract = {
237237
end
238238
if context.cardarea == G.play and context.main_scoring then
239239
return {
240-
message = localize({
241-
type = "variable",
242-
key = "a_powmult",
243-
vars = {
244-
number_format(card.ability.extra.Emult),
245-
},
246-
}),
247-
Emult_mod = card.ability.extra.Emult,
248-
colour = G.C.DARK_EDITION,
240+
e_mult = card.ability.extra.Emult,
249241
}
250242
end
251243

@@ -1827,7 +1819,7 @@ local glass_edition = {
18271819
loc_vars = function(self, info_queue, card)
18281820
return {
18291821
vars = {
1830-
cry_prob(card.ability.cry_prob, card.ability.odds, card.ability.cry_rigged),
1822+
cry_prob(card.ability.cry_prob, card.edition.odds, card.ability.cry_rigged),
18311823
card.ability.odds,
18321824
card and card.edition and card.edition.x_mult or self.config.x_mult,
18331825
},
@@ -1846,7 +1838,7 @@ local glass_edition = {
18461838
if
18471839
not card.ability.eternal
18481840
and pseudorandom("cry_fragile_destroy")
1849-
< cry_prob(card.ability.cry_prob, card.ability.odds, card.ability.cry_rigged) / card.ability.odds
1841+
< cry_prob(card.ability.cry_prob, card.aedition.odds, card.ability.cry_rigged) / card.edition.odds
18501842
then
18511843
-- this event call might need to be pushed later to make more sense
18521844
G.E_MANAGER:add_event(Event({

‎items/misc_joker.lua‎

Lines changed: 6 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -188,25 +188,13 @@ local happyhouse = {
188188
and to_big(card.ability.immutable.check) > to_big(card.ability.immutable.trigger)
189189
then
190190
return {
191-
message = localize({
192-
type = "variable",
193-
key = "a_powmult",
194-
vars = { number_format(card.ability.immutable.mult) },
195-
}),
196-
Emult_mod = lenient_bignum(card.ability.immutable.mult),
197-
colour = G.C.DARK_EDITION,
191+
e_mult = lenient_bignum(card.ability.immutable.mult),
198192
card = card,
199193
}
200194
end
201195
if context.forcetrigger then
202196
return {
203-
message = localize({
204-
type = "variable",
205-
key = "a_powmult",
206-
vars = { number_format(card.ability.immutable.mult) },
207-
}),
208-
Emult_mod = lenient_bignum(card.ability.immutable.mult),
209-
colour = G.C.DARK_EDITION,
197+
e_mult = lenient_bignum(card.ability.immutable.mult),
210198
card = card,
211199
}
212200
end
@@ -1249,7 +1237,7 @@ local compound_interest = {
12491237
key = "compound_interest",
12501238
config = {
12511239
extra = {
1252-
percent_mod = 3,
1240+
percent_mod = 5,
12531241
percent = 20,
12541242
},
12551243
},
@@ -7736,13 +7724,7 @@ local night = {
77367724
if context.joker_main and G.GAME.current_round.hands_left == 0 then
77377725
if to_big(card.ability.extra.mult) > to_big(1) then
77387726
return {
7739-
message = localize({
7740-
type = "variable",
7741-
key = "a_powmult",
7742-
vars = { number_format(card.ability.extra.mult) },
7743-
}),
7744-
Emult_mod = lenient_bignum(card.ability.extra.mult),
7745-
colour = G.C.DARK_EDITION,
7727+
e_mult = lenient_bignum(card.ability.extra.mult),
77467728
}
77477729
end
77487730
elseif
@@ -7814,13 +7796,7 @@ local night = {
78147796
end,
78157797
}))
78167798
return {
7817-
message = localize({
7818-
type = "variable",
7819-
key = "a_powmult",
7820-
vars = { number_format(card.ability.extra.mult) },
7821-
}),
7822-
Emult_mod = lenient_bignum(card.ability.extra.mult),
7823-
colour = G.C.DARK_EDITION,
7799+
e_mult = lenient_bignum(card.ability.extra.mult),
78247800
}
78257801
end
78267802
end,
@@ -8453,12 +8429,7 @@ local universe = {
84538429
}))
84548430
end
84558431
return {
8456-
message = localize({
8457-
type = "variable",
8458-
key = "a_powmult",
8459-
vars = { number_format(card.ability.extra.emult) },
8460-
}),
8461-
Emult_mod = lenient_bignum(card.ability.extra.emult),
8432+
e_mult = lenient_bignum(card.ability.extra.emult),
84628433
colour = G.C.DARK_EDITION,
84638434
}
84648435
end

0 commit comments

Comments
 (0)