Make moire only trigger when scored
This commit is contained in:
parent
81695eae8b
commit
780814fece
2 changed files with 6 additions and 6 deletions
|
|
@ -17,5 +17,5 @@
|
|||
"conflicts": [
|
||||
"Jen"
|
||||
],
|
||||
"version": "1.1.5"
|
||||
"version": "1.1.6"
|
||||
}
|
||||
|
|
@ -4,10 +4,6 @@ SMODS.Sound({key = "e_jumbo", path = "e_jumbo.ogg"})
|
|||
SMODS.Sound({key = "e_moire", path = "e_moire.ogg"})
|
||||
SMODS.Sound({key = "e_polygloss", path = "e_polygloss.ogg"})
|
||||
|
||||
local function get_weight(self)
|
||||
return G.GAME.edition_rate * self.weight
|
||||
end
|
||||
|
||||
local function allow_moire()
|
||||
if Cryptid then
|
||||
return true
|
||||
|
|
@ -22,6 +18,10 @@ local function allow_moire()
|
|||
return false
|
||||
end
|
||||
|
||||
local function get_weight(self)
|
||||
return G.GAME.edition_rate * self.weight * (allow_moire() and 1 or 0)
|
||||
end
|
||||
|
||||
SMODS.Edition({
|
||||
key = "polygloss",
|
||||
loc_txt = {
|
||||
|
|
@ -191,7 +191,7 @@ SMODS.Edition({
|
|||
return {vars = {self.config.e_chips, self.config.e_mult}}
|
||||
end,
|
||||
calculate = function(self, _, context)
|
||||
if context.post_joker or context.main_scoring then
|
||||
if context.post_joker or context.main_scoring and context.cardarea == G.play then
|
||||
return {e_chips = self.config.e_chips, e_mult = self.config.e_mult}
|
||||
end
|
||||
end,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue