@@ -2020,64 +2020,127 @@ end
20202020if SMODS and SMODS .Mods and (not SMODS .Mods .Talisman or not SMODS .Mods .Talisman .can_load ) then
20212021 local smods_xchips = false
20222022 for _ , v in pairs (SMODS .calculation_keys ) do
2023- if v == ' x_chips' then
2024- smods_xchips = true
2025- break
2026- end
2023+ if v == " x_chips" then
2024+ smods_xchips = true
2025+ break
2026+ end
20272027 end
20282028 local scie = SMODS .calculate_individual_effect
20292029 function SMODS .calculate_individual_effect (effect , scored_card , key , amount , from_edition )
20302030 local ret = scie (effect , scored_card , key , amount , from_edition )
20312031 if ret then
2032- return ret
2032+ return ret
20332033 end
2034- if (key == ' e_chips' or key == ' echips' or key == ' Echip_mod' ) and amount ~= 1 then
2035- if effect .card then juice_card (effect .card ) end
2034+ if (key == " e_chips" or key == " echips" or key == " Echip_mod" ) and amount ~= 1 then
2035+ if effect .card then
2036+ juice_card (effect .card )
2037+ end
20362038 hand_chips = mod_chips (hand_chips ^ amount )
2037- update_hand_text ({delay = 0 }, {chips = hand_chips , mult = mult })
2039+ update_hand_text ({ delay = 0 }, { chips = hand_chips , mult = mult })
20382040 if not effect .remove_default_message then
20392041 if from_edition then
2040- card_eval_status_text (scored_card , ' jokers' , nil , percent , nil , {message = " ^" .. amount , colour = G .C .EDITION , edition = true })
2041- elseif key ~= ' Echip_mod' then
2042+ card_eval_status_text (
2043+ scored_card ,
2044+ " jokers" ,
2045+ nil ,
2046+ percent ,
2047+ nil ,
2048+ { message = " ^" .. amount , colour = G .C .EDITION , edition = true }
2049+ )
2050+ elseif key ~= " Echip_mod" then
20422051 if effect .echip_message then
2043- card_eval_status_text (scored_card or effect .card or effect .focus , ' extra' , nil , percent , nil , effect .echip_message )
2052+ card_eval_status_text (
2053+ scored_card or effect .card or effect .focus ,
2054+ " extra" ,
2055+ nil ,
2056+ percent ,
2057+ nil ,
2058+ effect .echip_message
2059+ )
20442060 else
2045- card_eval_status_text (scored_card or effect .card or effect .focus , ' e_chips' , amount , percent )
2061+ card_eval_status_text (scored_card or effect .card or effect .focus , " e_chips" , amount , percent )
20462062 end
20472063 end
20482064 end
20492065 return true
20502066 end
2051- if (key == ' e_mult' or key == ' emult' or key == ' Emult_mod' ) and amount ~= 1 then
2052- if effect .card then juice_card (effect .card ) end
2067+ if (key == " e_mult" or key == " emult" or key == " Emult_mod" ) and amount ~= 1 then
2068+ if effect .card then
2069+ juice_card (effect .card )
2070+ end
20532071 mult = mod_mult (mult ^ amount )
2054- update_hand_text ({delay = 0 }, {chips = hand_chips , mult = mult })
2072+ update_hand_text ({ delay = 0 }, { chips = hand_chips , mult = mult })
20552073 if not effect .remove_default_message then
20562074 if from_edition then
2057- card_eval_status_text (scored_card , ' jokers' , nil , percent , nil , {message = " ^" .. amount .. " " .. localize (" k_mult" ), colour = G .C .EDITION , edition = true })
2058- elseif key ~= ' Emult_mod' then
2075+ card_eval_status_text (
2076+ scored_card ,
2077+ " jokers" ,
2078+ nil ,
2079+ percent ,
2080+ nil ,
2081+ { message = " ^" .. amount .. " " .. localize (" k_mult" ), colour = G .C .EDITION , edition = true }
2082+ )
2083+ elseif key ~= " Emult_mod" then
20592084 if effect .emult_message then
2060- card_eval_status_text (scored_card or effect .card or effect .focus , ' extra' , nil , percent , nil , effect .emult_message )
2085+ card_eval_status_text (
2086+ scored_card or effect .card or effect .focus ,
2087+ " extra" ,
2088+ nil ,
2089+ percent ,
2090+ nil ,
2091+ effect .emult_message
2092+ )
20612093 else
2062- card_eval_status_text (scored_card or effect .card or effect .focus , ' e_mult' , amount , percent )
2094+ card_eval_status_text (scored_card or effect .card or effect .focus , " e_mult" , amount , percent )
20632095 end
20642096 end
20652097 end
20662098 return true
20672099 end
20682100 end
2069- for _ , v in ipairs ({' e_mult' , ' e_chips' , ' ee_mult' , ' ee_chips' , ' eee_mult' , ' eee_chips' , ' hyper_mult' , ' hyper_chips' ,
2070- ' emult' , ' echips' , ' eemult' , ' eechips' , ' eeemult' , ' eeechips' , ' hypermult' , ' hyperchips' ,
2071- ' Emult_mod' , ' Echip_mod' , ' EEmult_mod' , ' EEchip_mod' , ' EEEmult_mod' , ' EEEchip_mod' , ' hypermult_mod' , ' hyperchip_mod' }) do
2072- table.insert (SMODS .calculation_keys , v )
2101+ for _ , v in ipairs ({
2102+ " e_mult" ,
2103+ " e_chips" ,
2104+ " ee_mult" ,
2105+ " ee_chips" ,
2106+ " eee_mult" ,
2107+ " eee_chips" ,
2108+ " hyper_mult" ,
2109+ " hyper_chips" ,
2110+ " emult" ,
2111+ " echips" ,
2112+ " eemult" ,
2113+ " eechips" ,
2114+ " eeemult" ,
2115+ " eeechips" ,
2116+ " hypermult" ,
2117+ " hyperchips" ,
2118+ " Emult_mod" ,
2119+ " Echip_mod" ,
2120+ " EEmult_mod" ,
2121+ " EEchip_mod" ,
2122+ " EEEmult_mod" ,
2123+ " EEEchip_mod" ,
2124+ " hypermult_mod" ,
2125+ " hyperchip_mod" ,
2126+ }) do
2127+ table.insert (SMODS .calculation_keys , v )
20732128 end
20742129 if not smods_xchips then
2075- for _ , v in ipairs ({' x_chips' , ' xchips' , ' Xchip_mod' }) do
2076- table.insert (SMODS .calculation_keys , v )
2130+ for _ , v in ipairs ({ " x_chips" , " xchips" , " Xchip_mod" }) do
2131+ table.insert (SMODS .calculation_keys , v )
20772132 end
20782133 end
2079- function to_number (a ) return a end
2080- function to_big (a ) return a end
2081- function lenient_bignum (a ) return a end
2082- function is_number (x ) return type (x ) == " number" end
2083- end
2134+ function to_number (a )
2135+ return a
2136+ end
2137+ function to_big (a )
2138+ return a
2139+ end
2140+ function lenient_bignum (a )
2141+ return a
2142+ end
2143+ function is_number (x )
2144+ return type (x ) == " number"
2145+ end
2146+ end
0 commit comments