Merge pull request #73 from HuyTheKiller/main

Properly localize all operations of Mult

Author: Jevonnissocoolman

lovely.toml

@@ -879,27 +879,27 @@ elseif eval_type == 'hyper_chips' then
 elseif eval_type == 'e_mult' then 
 	sound = 'talisman_emult'
 	amt = amt
-	text = '^' .. amt .. ' Mult'
+	text = '^' .. amt .. ' ' .. localize('k_mult')
 	colour = G.C.MULT
 	config.type = 'fade'
 	config.scale = 0.7
 elseif eval_type == 'ee_mult' then 
 	sound = 'talisman_eemult'
 	amt = amt
-	text = '^^' .. amt .. ' Mult'
+	text = '^^' .. amt .. ' ' .. localize('k_mult')
 	colour = G.C.MULT
 	config.type = 'fade'
 	config.scale = 0.7
 elseif eval_type == 'eee_mult' then 
 	sound = 'talisman_eeemult'
 	amt = amt
-	text = '^^^' .. amt .. ' Mult'
+	text = '^^^' .. amt .. ' ' .. localize('k_mult')
 	colour = G.C.MULT
 	config.type = 'fade'
 	config.scale = 0.7
 elseif eval_type == 'hyper_mult' then 
 	sound = 'talisman_eeemult'
-	text = (amt[1] > 5 and ('{' .. tostring(amt[1]) .. '}') or string.rep('^', amt[1])) .. tostring(amt[2]) .. ' Mult'
+	text = (amt[1] > 5 and ('{' .. tostring(amt[1]) .. '}') or string.rep('^', amt[1])) .. tostring(amt[2]) .. ' ' .. localize('k_mult')
 	amt = amt[2]
 	colour = G.C.MULT
 	config.type = 'fade'
@@ -1108,31 +1108,31 @@ if scoring_hand and scoring_hand[i] and scoring_hand[i].edition then
 		mult = mod_mult(mult ^ edi.e_mult)
 		update_hand_text({delay = 0}, {mult = mult})
 		card_eval_status_text(trg, 'extra', nil, percent, nil,
-		{message = '^'.. edi.e_mult ..' Mult',
+		{message = '^'.. edi.e_mult ..' ' .. localize('k_mult'),
 		edition = true,
 		e_mult = true})
 	end
 	if edi.ee_mult then
 		mult = mod_mult(mult:arrow(2, edi.ee_mult))
 		update_hand_text({delay = 0}, {mult = mult})
 		card_eval_status_text(trg, 'extra', nil, percent, nil,
-		{message = '^^'.. edi.ee_mult ..' Mult',
+		{message = '^^'.. edi.ee_mult ..' ' .. localize('k_mult'),
 		edition = true,
 		ee_mult = true})
 	end
 	if edi.eee_mult then
 		mult = mod_mult(mult:arrow(3, edi.eee_mult))
 		update_hand_text({delay = 0}, {mult = mult})
 		card_eval_status_text(trg, 'extra', nil, percent, nil,
-		{message = '^^^'.. edi.eee_mult ..' Mult',
+		{message = '^^^'.. edi.eee_mult ..' ' .. localize('k_mult'),
 		edition = true,
 		eee_mult = true})
 	end
 	if edi.hyper_mult and type(edi.hyper_mult) == 'table' then
 		mult = mod_mult(mult:arrow(edi.hyper_mult[1], edi.hyper_mult[2]))
 		update_hand_text({delay = 0}, {mult = mult})
 		card_eval_status_text(trg, 'extra', nil, percent, nil,
-		{message = (edi.hyper_mult[1] > 5 and ('{' .. edi.hyper_mult[1] .. '}') or string.rep('^', edi.hyper_mult[1])) .. edi.hyper_mult[2] ..' Mult',
+		{message = (edi.hyper_mult[1] > 5 and ('{' .. edi.hyper_mult[1] .. '}') or string.rep('^', edi.hyper_mult[1])) .. edi.hyper_mult[2] ..' ' .. localize('k_mult'),
 		edition = true,
 		hyper_mult = true})
 	end
@@ -1203,31 +1203,31 @@ if G.jokers.cards and G.jokers.cards[i] and G.jokers.cards[i].edition then
 		mult = mod_mult(mult ^ edi.e_mult)
 		update_hand_text({delay = 0}, {mult = mult})
 		card_eval_status_text(trg, 'extra', nil, percent, nil,
-		{message = '^'.. edi.e_mult ..' Mult',
+		{message = '^'.. edi.e_mult ..' ' .. localize('k_mult'),
 		edition = true,
 		e_mult = true})
 	end
 	if edi.ee_mult then
 		mult = mod_mult(mult:arrow(2, edi.ee_mult))
 		update_hand_text({delay = 0}, {mult = mult})
 		card_eval_status_text(trg, 'extra', nil, percent, nil,
-		{message = '^^'.. edi.ee_mult ..' Mult',
+		{message = '^^'.. edi.ee_mult ..' ' .. localize('k_mult'),
 		edition = true,
 		ee_mult = true})
 	end
 	if edi.eee_mult then
 		mult = mod_mult(mult:arrow(3, edi.eee_mult))
 		update_hand_text({delay = 0}, {mult = mult})
 		card_eval_status_text(trg, 'extra', nil, percent, nil,
-		{message = '^^^'.. edi.eee_mult ..' Mult',
+		{message = '^^^'.. edi.eee_mult ..' ' .. localize('k_mult'),
 		edition = true,
 		eee_mult = true})
 	end
 	if edi.hyper_mult and type(edi.hyper_mult) == 'table' then
 		mult = mod_mult(mult:arrow(edi.hyper_mult[1], edi.hyper_mult[2]))
 		update_hand_text({delay = 0}, {mult = mult})
 		card_eval_status_text(trg, 'extra', nil, percent, nil,
-		{message = (edi.hyper_mult[1] > 5 and ('{' .. edi.hyper_mult[1] .. '}') or string.rep('^', edi.hyper_mult[1])) .. edi.hyper_mult[2] ..' Mult',
+		{message = (edi.hyper_mult[1] > 5 and ('{' .. edi.hyper_mult[1] .. '}') or string.rep('^', edi.hyper_mult[1])) .. edi.hyper_mult[2] ..' ' .. localize('k_mult'),
 		edition = true,
 		hyper_mult = true})
 	end

steamodded_metadata.lua

@@ -57,6 +57,9 @@ if SMODS.current_mod then
   SMODS.current_mod.debug_info = {
     ["Break Infinity"] = Talisman.config_file.break_infinity
   }
+  SMODS.current_mod.description_loc_vars = function()
+    return { background_colour = G.C.CLEAR, text_colour = G.C.WHITE, scale = 1.2 }
+  end
 end
 --[[SMODS.Joker{
   key = "test",

talisman.lua

@@ -983,7 +983,7 @@ if SMODS and SMODS.calculate_individual_effect then
       update_hand_text({delay = 0}, {chips = hand_chips, mult = mult})
       if not effect.remove_default_message then
           if from_edition then
-              card_eval_status_text(scored_card, 'jokers', nil, percent, nil, {message = "^"..amount.." Mult", colour =  G.C.EDITION, edition = true})
+              card_eval_status_text(scored_card, 'jokers', nil, percent, nil, {message = "^"..amount.." "..localize("k_mult"), colour =  G.C.EDITION, edition = true})
           elseif key ~= 'Emult_mod' then
               if effect.emult_message then
                   card_eval_status_text(scored_card or effect.card or effect.focus, 'extra', nil, percent, nil, effect.emult_message)
@@ -1001,7 +1001,7 @@ if SMODS and SMODS.calculate_individual_effect then
       update_hand_text({delay = 0}, {chips = hand_chips, mult = mult})
       if not effect.remove_default_message then
           if from_edition then
-              card_eval_status_text(scored_card, 'jokers', nil, percent, nil, {message = "^^"..amount.." Mult", colour =  G.C.EDITION, edition = true})
+              card_eval_status_text(scored_card, 'jokers', nil, percent, nil, {message = "^^"..amount.." "..localize("k_mult"), colour =  G.C.EDITION, edition = true})
           elseif key ~= 'EEmult_mod' then
               if effect.eemult_message then
                   card_eval_status_text(scored_card or effect.card or effect.focus, 'extra', nil, percent, nil, effect.eemult_message)
@@ -1019,7 +1019,7 @@ if SMODS and SMODS.calculate_individual_effect then
       update_hand_text({delay = 0}, {chips = hand_chips, mult = mult})
       if not effect.remove_default_message then
           if from_edition then
-              card_eval_status_text(scored_card, 'jokers', nil, percent, nil, {message = "^^^"..amount.." Mult", colour =  G.C.EDITION, edition = true})
+              card_eval_status_text(scored_card, 'jokers', nil, percent, nil, {message = "^^^"..amount.." "..localize("k_mult"), colour =  G.C.EDITION, edition = true})
           elseif key ~= 'EEEmult_mod' then
               if effect.eeemult_message then
                   card_eval_status_text(scored_card or effect.card or effect.focus, 'extra', nil, percent, nil, effect.eeemult_message)
@@ -1037,7 +1037,7 @@ if SMODS and SMODS.calculate_individual_effect then
       update_hand_text({delay = 0}, {chips = hand_chips, mult = mult})
       if not effect.remove_default_message then
           if from_edition then
-              card_eval_status_text(scored_card, 'jokers', nil, percent, nil, {message = ((amount[1] > 5 and ('{' .. amount[1] .. '}') or string.rep('^', amount[1])) .. amount[2]).." Mult", colour =  G.C.EDITION, edition = true})
+              card_eval_status_text(scored_card, 'jokers', nil, percent, nil, {message = ((amount[1] > 5 and ('{' .. amount[1] .. '}') or string.rep('^', amount[1])) .. amount[2]).." "..localize("k_mult"), colour =  G.C.EDITION, edition = true})
           elseif key ~= 'hypermult_mod' then
               if effect.hypermult_message then
                   card_eval_status_text(scored_card or effect.card or effect.focus, 'extra', nil, percent, nil, effect.hypermult_message)