Buff Moire

This commit is contained in:
Emik 2026-07-06 19:30:26 +02:00
parent 6b1739aa0c
commit cce2591266
Signed by: emik
GPG key ID: 6B0CD72A5E503BDF
2 changed files with 20 additions and 19 deletions

View file

@ -18,5 +18,5 @@
"conflicts": [ "conflicts": [
"Jen" "Jen"
], ],
"version": "1.11.5" "version": "1.11.6"
} }

View file

@ -4,16 +4,6 @@ SMODS.Sound({key = "e_jumbo", path = "e_jumbo.ogg"})
SMODS.Sound({key = "e_moire", path = "e_moire.ogg"}) SMODS.Sound({key = "e_moire", path = "e_moire.ogg"})
SMODS.Sound({key = "e_polygloss", path = "e_polygloss.ogg"}) SMODS.Sound({key = "e_polygloss", path = "e_polygloss.ogg"})
local function allow_moire()
for _, v in pairs(SMODS.find_card("j_jane_saint")) do
if v.ability.extra.is_attuned then
return true
end
end
return false
end
local function get_weight(self) local function get_weight(self)
return G.GAME.edition_rate * self.weight return G.GAME.edition_rate * self.weight
end end
@ -214,22 +204,33 @@ SMODS.Edition({
"{X:mult,C:dark_edition}^#2#{C:mult} Mult", "{X:mult,C:dark_edition}^#2#{C:mult} Mult",
}, },
}, },
config = {e_chips = Jane.cry and 0.8 or 0.9, e_mult = Jane.cry and 1.2 or 1.1}, config = {e_chips = 0.8, e_mult = 1.2},
sound = {sound = "jane_e_moire", per = 1, vol = 0.7}, sound = {sound = "jane_e_moire", per = 1, vol = 0.7},
weight = 1, weight = 1,
extra_cost = 10, extra_cost = 10,
in_shop = true, in_shop = true,
shader = "moire", shader = "moire",
apply_to_float = false, apply_to_float = false,
get_weight = function(self) get_weight = get_weight,
return G.GAME.edition_rate * self.weight * (allow_moire() and 20 or 2)
end,
loc_vars = function(self, _, _) loc_vars = function(self, _, _)
return {vars = {self.config.e_chips, self.config.e_mult}} return {vars = {self.config.e_chips, self.config.e_mult}}
end, end,
calculate = function(self, _, context) calculate = function(self, card, context)
if context.post_joker or context.main_scoring and context.cardarea == G.play then return (
return {e_chips = self.config.e_chips, e_mult = self.config.e_mult} context.post_joker or
end context.main_scoring and
context.cardarea == G.play
) and {
extra = {
card = card,
colour = G.C.jane_RGB,
e_chips = self.config.e_chips,
extra = {
card = card,
colour = G.C.jane_RGB,
e_mult = self.config.e_mult,
},
},
} or nil
end, end,
}) })