Skip to content

Commit b468b90

Browse files
lord-rubylord-ruby
committed
Merge branch 'balance-things' of https://github.com/SpectralPack/Cryptid into balance-things
2 parents 64db67a + c117447 commit b468b90

File tree

5 files changed

+59
-33
lines changed

5 files changed

+59
-33
lines changed

‎items/code.lua‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2159,7 +2159,13 @@ local hooked = {
21592159
end
21602160
var = var or ("[no joker found - " .. (card.ability.cry_hook_id or "nil") .. "]")
21612161
end
2162-
return { vars = { var or "hooked Joker", card.ability.cry_hook_triggers or 8, card.ability.cry_hook_triggers_left or 8 } }
2162+
return {
2163+
vars = {
2164+
var or "hooked Joker",
2165+
card.ability.cry_hook_triggers or 8,
2166+
card.ability.cry_hook_triggers_left or 8,
2167+
},
2168+
}
21632169
end,
21642170
key = "cry_hooked",
21652171
no_sticker_sheet = true,
@@ -2176,7 +2182,10 @@ local hooked = {
21762182
and not context.forcetrigger
21772183
and not context.other_context.forcetrigger
21782184
then
2179-
if not card.ability.cry_hook_triggers_left then card.ability.cry_hook_triggers_left = 8; card.ability.cry_hook_triggers = 8 end
2185+
if not card.ability.cry_hook_triggers_left then
2186+
card.ability.cry_hook_triggers_left = 8
2187+
card.ability.cry_hook_triggers = 8
2188+
end
21802189
for i = 1, #G.jokers.cards do
21812190
if G.jokers.cards[i].sort_id == card.ability.cry_hook_id then
21822191
local results = Cryptid.forcetrigger(G.jokers.cards[i], context)
@@ -2192,7 +2201,7 @@ local hooked = {
21922201
G.jokers.cards[i].ability.cry_hook_triggers_left = 8
21932202
card.ability.cry_hook_triggers_left = 8
21942203
return true
2195-
end
2204+
end,
21962205
}))
21972206
end
21982207
return results.jokers

‎items/epic.lua‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -215,15 +215,16 @@ local googol_play = {
215215
cry_prob(card.ability.cry_prob, card.ability.extra.odds, card.ability.cry_rigged),
216216
card.ability.extra.odds,
217217
number_format(card.ability.extra.Xmult),
218-
number_format(card.ability.extra.Xmult_payout)
218+
number_format(card.ability.extra.Xmult_payout),
219219
},
220220
}
221221
end,
222222
calculate = function(self, card, context)
223223
if context.joker_main then
224224
if
225225
pseudorandom("cry_googol_play")
226-
< cry_prob(card.ability.cry_prob, card.ability.extra.odds, card.ability.cry_rigged) / card.ability.extra.odds
226+
< cry_prob(card.ability.cry_prob, card.ability.extra.odds, card.ability.cry_rigged)
227+
/ card.ability.extra.odds
227228
then
228229
return {
229230
message = localize({
@@ -1780,7 +1781,13 @@ local altgoogol = {
17801781
end,
17811782
calculate = function(self, card, context)
17821783
local gameset = Card.get_gameset(card)
1783-
if context.end_of_round and not context.retrigger_joker and not context.blueprint and not context.individual and not context.repetition then
1784+
if
1785+
context.end_of_round
1786+
and not context.retrigger_joker
1787+
and not context.blueprint
1788+
and not context.individual
1789+
and not context.repetition
1790+
then
17841791
card.ability.rounds_left = card.ability.rounds_left - 1
17851792
if to_big(card.ability.rounds_left) <= to_big(0) then
17861793
local eval = function(card)
@@ -2151,10 +2158,9 @@ local jtron = {
21512158
}
21522159
end,
21532160
calculate = function(self, card, context)
2154-
21552161
if context.cardarea == G.jokers and context.joker_main then
21562162
card.ability.immutable.current =
2157-
lenient_bignum(1 + to_big(card.ability.extra.bonus) * #SMODS.find_card("j_joker"))
2163+
lenient_bignum(1 + to_big(card.ability.extra.bonus) * #SMODS.find_card("j_joker"))
21582164
if to_big(card.ability.immutable.current) > to_big(0) then
21592165
return {
21602166
message = localize({
@@ -2169,7 +2175,13 @@ local jtron = {
21692175
}
21702176
end
21712177
end
2172-
if context.end_of_round and not context.blueprint and not context.individual and not context.repetition and not context.retrigger_joker then
2178+
if
2179+
context.end_of_round
2180+
and not context.blueprint
2181+
and not context.individual
2182+
and not context.repetition
2183+
and not context.retrigger_joker
2184+
then
21732185
if #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit then
21742186
G.E_MANAGER:add_event(Event({
21752187
func = function()

‎items/exotic.lua‎

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ local effarcire = {
567567
name = "cry-Effarcire",
568568
key = "effarcire",
569569
config = {
570-
extra = 5
570+
extra = 5,
571571
},
572572
immutable = true,
573573
pos = { x = 0, y = 0 },
@@ -602,8 +602,8 @@ local effarcire = {
602602
loc_vars = function(self, queue, card)
603603
return {
604604
vars = {
605-
card.ability.extra
606-
}
605+
card.ability.extra,
606+
},
607607
}
608608
end,
609609
cry_credits = {
@@ -632,7 +632,7 @@ local crustulum = {
632632
config = {
633633
extra = {
634634
rerolls_stored = 0,
635-
rerolls_per = 8
635+
rerolls_per = 8,
636636
},
637637
},
638638
pos = { x = 0, y = 2 },
@@ -662,36 +662,43 @@ local crustulum = {
662662
calculate_reroll_cost(true)
663663
return {
664664
message = "-1",
665-
colour = G.C.DARK_EDITION
665+
colour = G.C.DARK_EDITION,
666666
}
667667
end
668668
end
669-
if context.end_of_round and not context.blueprint and not context.repetition and not context.retrigger_joker and not context.individual then
669+
if
670+
context.end_of_round
671+
and not context.blueprint
672+
and not context.repetition
673+
and not context.retrigger_joker
674+
and not context.individual
675+
then
670676
if #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit then
671-
SMODS.add_card{
672-
set="Food",
673-
area=G.jokers
674-
}
677+
SMODS.add_card({
678+
set = "Food",
679+
area = G.jokers,
680+
})
675681
end
676682
end
677683
if context.food_joker_expired then
678684
center.ability.extra.rerolls_stored = center.ability.extra.rerolls_stored + center.ability.extra.rerolls_per
679685
return {
680686
message = localize("k_upgrade_ex"),
681-
colour = G.C.DARK_EDITION
687+
colour = G.C.DARK_EDITION,
682688
}
683689
end
684690
if context.forcetrigger then
685-
center.ability.extra.rerolls_stored = center.ability.extra.rerolls_stored + center.abilities.extra.rerolls_per
691+
center.ability.extra.rerolls_stored = center.ability.extra.rerolls_stored
692+
+ center.abilities.extra.rerolls_per
686693
if #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit then
687-
SMODS.add_card{
688-
set="Food",
689-
area=G.jokers
690-
}
694+
SMODS.add_card({
695+
set = "Food",
696+
area = G.jokers,
697+
})
691698
end
692699
return {
693700
message = localize("k_upgrade_ex"),
694-
colour = G.C.DARK_EDITION
701+
colour = G.C.DARK_EDITION,
695702
}
696703
end
697704
end,
@@ -714,12 +721,12 @@ local crustulum = {
714721
local c = remove_ref(self, card, ...)
715722
if card and card:is_food() and self == G.jokers and not G.SETTINGS.paused then
716723
if card.states.drag.is == true and card.children.center.pinch.x == true then
717-
SMODS.calculate_context({food_joker_expired = true, card = self})
724+
SMODS.calculate_context({ food_joker_expired = true, card = self })
718725
end
719726
end
720727
return c
721728
end
722-
end
729+
end,
723730
}
724731
--todo: make the Emult always prime
725732
local primus = {

‎items/misc_joker.lua‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9930,9 +9930,7 @@ local familiar_currency = {
99309930
and not context.repetition
99319931
and not (context.blueprint_card or card).getting_sliced
99329932
then
9933-
if
9934-
to_big(G.GAME.dollars - G.GAME.bankrupt_at) >= to_big(card.ability.extra)
9935-
then
9933+
if to_big(G.GAME.dollars - G.GAME.bankrupt_at) >= to_big(card.ability.extra) then
99369934
ease_dollars(-card.ability.extra)
99379935
card.ability.taken_so_far = card.ability.taken_so_far + 1
99389936
card_eval_status_text(

‎localization/en-us.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,7 @@ return {
10481048
text = {
10491049
"{C:green}#1# in #2#{} chance for",
10501050
"{X:red,C:white} X#4# {} Mult",
1051-
"Otherwise {X:red,C:white}X#3#{} Mult"
1051+
"Otherwise {X:red,C:white}X#3#{} Mult",
10521052
},
10531053
},
10541054
j_cry_antennastoheaven = {
@@ -2756,7 +2756,7 @@ return {
27562756
"{C:red}destroy{} pack cards based on how many",
27572757
"{C:attention}choices{} are left. Gain {X:dark_edition,C:white}^#1#{} Mult",
27582758
"for each card {C:red}destroyed{}",
2759-
"{C:inactive}(Currently, {X:dark_edition,C:white}^#2#{} {C:inactive}Mult)"
2759+
"{C:inactive}(Currently, {X:dark_edition,C:white}^#2#{} {C:inactive}Mult)",
27602760
},
27612761
},
27622762
j_cry_stronghold = {

0 commit comments

Comments
 (0)