emik/Jane
1
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make moire only trigger when scored

Browse source
This commit is contained in:
Emik 2025-04-13 03:33:26 +02:00
parent 81695eae8b
commit 780814fece
Signed by untrusted user who does not match committer: emik
GPG key ID: 09CDFF9E5703688D
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifest.json
View file

@ -17,5 +17,5 @@
"conflicts": [ "conflicts": [
"Jen" "Jen"
], ],
"version": "1.1.5" "version": "1.1.6"
} }

10
src/edition.lua
View file

@ -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_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 get_weight(self)
return G.GAME.edition_rate * self.weight
end
local function allow_moire() local function allow_moire()
if Cryptid then if Cryptid then
return true return true
@ -22,6 +18,10 @@ local function allow_moire()
return false return false
end end
local function get_weight(self)
return G.GAME.edition_rate * self.weight * (allow_moire() and 1 or 0)
end
SMODS.Edition({ SMODS.Edition({
key = "polygloss", key = "polygloss",
loc_txt = { loc_txt = {
@ -191,7 +191,7 @@ SMODS.Edition({
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, _, 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} return {e_chips = self.config.e_chips, e_mult = self.config.e_mult}
end end
end, end,