diff --git a/manifest.json b/manifest.json index a9b2b83..55ea3e0 100644 --- a/manifest.json +++ b/manifest.json @@ -17,5 +17,5 @@ "conflicts": [ "Jen" ], - "version": "1.6.1" + "version": "1.6.2" } \ No newline at end of file diff --git a/src/edition.lua b/src/edition.lua index 6b516dc..5806a21 100644 --- a/src/edition.lua +++ b/src/edition.lua @@ -22,10 +22,6 @@ local function get_weight(self) return G.GAME.edition_rate * self.weight end -local function is_playing_card(card) - return ({Default = true, Enhanced = true})[((card.config or {}).center or {}).set] -end - SMODS.Edition({ key = "polygloss", loc_txt = { diff --git a/src/joker.lua b/src/joker.lua index 82a0f3f..2ba8baf 100644 --- a/src/joker.lua +++ b/src/joker.lua @@ -236,7 +236,7 @@ SMODS.Joker { end end - local tags = math.min(G.GAME.dollars * (math.pow(extra.xmoney, xtimes) - 1), extra.max) + local tags = math.min(G.GAME.dollars, extra.max) * (math.pow(extra.xmoney, xtimes) - 1) ease_dollars(math.ceil(times * extra.money + tags)) end, tag_threshold = 30,