Merge pull request #747 from 70UNIK/Balance2

Balanced Branch: Emult/Echips color fix, Xchips jokers fix, fragile edition loc fix

Author: lord-ruby

items/misc.lua

@@ -1817,10 +1817,20 @@ local glass_edition = {
 	extra_cost = 2,
 	config = { x_mult = 3, odds = 8, trigger = nil },
 	loc_vars = function(self, info_queue, card)
+		local prob = 1
+		local odds = 8
+		if card and card.ability then
+			if card.ability.cry_prob then
+				prob = cry_prob(card.ability.cry_prob, card.edition.odds, card.ability.cry_rigged)
+			end
+			if card.ability.odds then
+				odds = card.ability.odds
+			end
+		end
 		return {
 			vars = {
-				cry_prob(card.ability.cry_prob, card.edition.odds, card.ability.cry_rigged),
-				card.ability.odds,
+				prob,
+				odds,
 				card and card.edition and card.edition.x_mult or self.config.x_mult,
 			},
 		}

items/misc_joker.lua

@@ -1309,7 +1309,7 @@ local big_cube = {
 					key = "a_xchips",
 					vars = { number_format(card.ability.extra.x_chips) },
 				}),
-				Xchip_mod = lenient_bignum(card.ability.extra.x_chips),
+				x_chips = lenient_bignum(card.ability.extra.x_chips),
 				colour = G.C.CHIPS,
 			}
 		end
@@ -2315,7 +2315,7 @@ local antennastoheaven = {
 					key = "a_xchips",
 					vars = { number_format(card.ability.extra.x_chips) },
 				}),
-				Xchip_mod = lenient_bignum(card.ability.extra.x_chips),
+				x_chips = lenient_bignum(card.ability.extra.x_chips),
 				colour = G.C.CHIPS,
 			}
 		end
@@ -2339,7 +2339,7 @@ local antennastoheaven = {
 					key = "a_xchips",
 					vars = { number_format(card.ability.extra.x_chips) },
 				}),
-				Xchip_mod = lenient_bignum(card.ability.extra.x_chips),
+				x_chips = lenient_bignum(card.ability.extra.x_chips),
 				colour = G.C.CHIPS,
 			}
 		end
@@ -3037,7 +3037,7 @@ local pirate_dagger = {
 					key = "a_xchips",
 					vars = { number_format(card.ability.extra.x_chips) },
 				}),
-				Xchip_mod = lenient_bignum(card.ability.extra.x_chips),
+				x_chips = lenient_bignum(card.ability.extra.x_chips),
 			}
 		end
 		local my_pos = nil
@@ -3111,7 +3111,7 @@ local pirate_dagger = {
 					key = "a_xchips",
 					vars = { number_format(card.ability.extra.x_chips) },
 				}),
-				Xchip_mod = lenient_bignum(card.ability.extra.x_chips),
+				x_chips = lenient_bignum(card.ability.extra.x_chips),
 			}
 		end
 	end,
@@ -3396,7 +3396,7 @@ local spaceglobe = {
 					key = "a_xchips",
 					vars = { number_format(card.ability.extra.x_chips) },
 				}),
-				Xchip_mod = lenient_bignum(card.ability.extra.x_chips),
+				x_chips = lenient_bignum(card.ability.extra.x_chips),
 				colour = G.C.CHIPS,
 			}
 		end
@@ -3409,7 +3409,7 @@ local spaceglobe = {
 					key = "a_xchips",
 					vars = { number_format(card.ability.extra.x_chips) },
 				}),
-				Xchip_mod = lenient_bignum(card.ability.extra.x_chips),
+				x_chips = lenient_bignum(card.ability.extra.x_chips),
 				colour = G.C.CHIPS,
 			}
 		end

lovely/misc.toml

@@ -701,15 +701,15 @@ elseif eval_type == 'x_chips' then
 elseif eval_type == 'e_chips' then 
 	sound = 'cry_echips'
 	amt = amt
-	text = '^' .. amt
-	colour = G.C.CHIPS
+	text = '^' .. amt .. ' ' .. localize('k_chips')
+	colour = G.C.DARK_EDITION
 	config.type = 'fade'
 	config.scale = 0.7
 elseif eval_type == 'e_mult' then 
 	sound = 'cry_emult'
 	amt = amt
 	text = '^' .. amt .. ' ' .. localize('k_mult')
-	colour = G.C.MULT
+	colour = G.C.DARK_EDITION
 	config.type = 'fade'
 	config.scale = 0.7
 '''