File tree Expand file tree Collapse file tree 2 files changed +17
-18
lines changed
Expand file tree Collapse file tree 2 files changed +17
-18
lines changed Original file line number Diff line number Diff line change @@ -1073,7 +1073,7 @@ local glass_edition = {
10731073 end
10741074
10751075 if
1076- context .cardarea == G .jokers and context .post_trigger -- animation-wise this looks weird sometimes
1076+ context .cardarea == G .jokers and context .post_trigger and context . other_card == card -- animation-wise this looks weird sometimes
10771077 then
10781078 if
10791079 not card .ability .eternal
@@ -1187,11 +1187,20 @@ local gold_edition = {
11871187 card .edition .cry_gold_seed = pseudorandom (" e_cry_gold" ) * 2 - 1
11881188 end ,
11891189 calculate = function (self , card , context )
1190- if context .post_trigger or (context .using_consumeable and context .consumeable == card ) or (context .main_scoring and context .cardarea == G .play and self .config .active ) then
1191- SMODS .calculate_effect ({ p_dollars = self .config .dollars }, card , true )
1192- self .config .active = nil
1193- else if not self .config .active then
1194- self .config .active = true
1190+ if
1191+ (
1192+ context .post_trigger -- for when on jonklers
1193+ and context .other_card == card
1194+ ) or (
1195+ context .main_scoring -- for when on playing cards
1196+ and context .cardarea == G .play
1197+ ) or (
1198+ context .using_consumeable -- for when using a consumable
1199+ and context .consumeable == card
1200+ )
1201+ then
1202+ print (context )
1203+ return { p_dollars = self .config .dollars } -- updated value
11951204 end
11961205 end ,
11971206}
Original file line number Diff line number Diff line change @@ -1942,18 +1942,8 @@ local hunger = {
19421942 loc_vars = function (self , info_queue , center )
19431943 return { vars = { center .ability .extra .money } }
19441944 end ,
1945- calculate = function (self , card , context ) -- This didn't work for Jevonn for some reason but it works for me :joker:
1946- if context .using_consumeable then -- shush
1947- ease_dollars (card .ability .extra .money )
1948- card_eval_status_text (
1949- context .blueprint_card or card ,
1950- " extra" ,
1951- nil ,
1952- nil ,
1953- nil ,
1954- { message = " $" .. card .ability .extra .money , colour = G .C .MONEY }
1955- )
1956- end
1945+ calculate = function (self , card , context ) -- haha one liner
1946+ return context .using_consumeable and {p_dollars = card .ability .extra .money }
19571947 end ,
19581948 cry_credits = {
19591949 idea = {
You can’t perform that action at this time.
0 commit comments