Compare commits
2 commits
81695eae8b
...
a061166e36
| Author | SHA1 | Date | |
|---|---|---|---|
| a061166e36 | |||
|
|
780814fece |
3 changed files with 30 additions and 14 deletions
|
|
@ -17,5 +17,5 @@
|
|||
"conflicts": [
|
||||
"Jen"
|
||||
],
|
||||
"version": "1.1.5"
|
||||
"version": "1.2.0"
|
||||
}
|
||||
32
src/back.lua
32
src/back.lua
|
|
@ -5,9 +5,25 @@ SMODS.Atlas {
|
|||
path = Jane.config.texture_pack .. "/b_jane_decks.png",
|
||||
}
|
||||
|
||||
local function back(x)
|
||||
SMODS.Back(x)
|
||||
local text = x.loc_txt.text
|
||||
local name = x.loc_txt.name:gsub("Deck$", "Sleeve")
|
||||
|
||||
CardSleeves.Sleeve {
|
||||
key = x.key,
|
||||
pos = x.pos,
|
||||
apply = x.apply,
|
||||
atlas = "janedecks",
|
||||
loc_vars = x.loc_vars,
|
||||
trigger_effect = x.trigger_effect,
|
||||
loc_txt = {name = name, text = text},
|
||||
}
|
||||
end
|
||||
|
||||
local eternal_text = Cryptid and "Absolute" or "Eternal"
|
||||
|
||||
SMODS.Back {
|
||||
back {
|
||||
key = "nitro",
|
||||
atlas = "janedecks",
|
||||
pos = {x = 1, y = 1},
|
||||
|
|
@ -75,7 +91,7 @@ local function add_rain_world_joker()
|
|||
return true
|
||||
end
|
||||
|
||||
SMODS.Back {
|
||||
back {
|
||||
key = "karma",
|
||||
atlas = "janedecks",
|
||||
pos = {x = 3, y = 0},
|
||||
|
|
@ -97,7 +113,7 @@ SMODS.Back {
|
|||
end,
|
||||
}
|
||||
|
||||
SMODS.Back {
|
||||
back {
|
||||
key = "mysterious",
|
||||
atlas = "janedecks",
|
||||
pos = {x = 1, y = 0},
|
||||
|
|
@ -120,7 +136,7 @@ SMODS.Back {
|
|||
end,
|
||||
}
|
||||
|
||||
SMODS.Back {
|
||||
back {
|
||||
key = "obsidian",
|
||||
atlas = "janedecks",
|
||||
pos = {x = 2, y = 1},
|
||||
|
|
@ -167,7 +183,7 @@ local function apply_orrery()
|
|||
end)
|
||||
end
|
||||
|
||||
SMODS.Back {
|
||||
back {
|
||||
key = "orrery",
|
||||
atlas = "janedecks",
|
||||
pos = {x = 0, y = 0},
|
||||
|
|
@ -183,7 +199,7 @@ SMODS.Back {
|
|||
end,
|
||||
}
|
||||
|
||||
SMODS.Back {
|
||||
back {
|
||||
key = "tortoise",
|
||||
atlas = "janedecks",
|
||||
pos = {x = 3, y = 1},
|
||||
|
|
@ -233,7 +249,7 @@ local function apply_weeck()
|
|||
end)
|
||||
end
|
||||
|
||||
SMODS.Back {
|
||||
back {
|
||||
key = "weeck",
|
||||
atlas = "janedecks",
|
||||
pos = {x = 4, y = 1},
|
||||
|
|
@ -251,7 +267,7 @@ SMODS.Back {
|
|||
end,
|
||||
}
|
||||
|
||||
SMODS.Back {
|
||||
back {
|
||||
key = "omega",
|
||||
atlas = "janedecks",
|
||||
pos = {x = 5, y = 1},
|
||||
|
|
|
|||
|
|
@ -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