From 571eff1e53ba14b96b04710020ee97238db22a7b Mon Sep 17 00:00:00 2001 From: Emik Date: Mon, 12 May 2025 16:59:49 +0200 Subject: [PATCH] Nerf survivor in non-cryptid to promote more interesting play --- lovely.toml | 13 +++++++++---- manifest.json | 2 +- src/slugcat.lua | 6 +++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lovely.toml b/lovely.toml index 255c604..31527fd 100644 --- a/lovely.toml +++ b/lovely.toml @@ -57,10 +57,15 @@ target = "functions/state_events.lua" pattern = "for _, v in ipairs(SMODS.get_card_areas('playing_cards')) do" position = "after" payload = '''if v == G.hand and not (G.GAME.blind and G.GAME.blind.name == "The Card" and not G.GAME.blind.disabled) and next(SMODS.find_card("j_jane_survivor")) then - for _, v in ipairs(G.hand.cards) do - local area = {cards = {v}} - SMODS.calculate_main_scoring({cardarea = area, full_hand = area.cards, scoring_hand = area.cards, scoring_name = text, poker_hands = poker_hands}, area.cards) - SMODS.calculate_main_scoring({cardarea = area, full_hand = area.cards, scoring_hand = area.cards, scoring_name = text, poker_hands = poker_hands}, nil) + if Cryptid then + for _, v in ipairs(G.hand.cards) do + local area = {cards = {v}} + SMODS.calculate_main_scoring({cardarea = area, full_hand = area.cards, scoring_hand = area.cards, scoring_name = text, poker_hands = poker_hands}, area.cards) + SMODS.calculate_main_scoring({cardarea = area, full_hand = area.cards, scoring_hand = area.cards, scoring_name = text, poker_hands = poker_hands}, nil) + end + else + SMODS.calculate_main_scoring({cardarea = G.hand, full_hand = G.hand.cards, scoring_hand = G.hand.cards, scoring_name = text, poker_hands = poker_hands}, G.hand.cards) + SMODS.calculate_main_scoring({cardarea = G.hand, full_hand = G.hand.cards, scoring_hand = G.hand.cards, scoring_name = text, poker_hands = poker_hands}, nil) end else''' match_indent = true diff --git a/manifest.json b/manifest.json index d0535cd..19b2068 100644 --- a/manifest.json +++ b/manifest.json @@ -17,5 +17,5 @@ "conflicts": [ "Jen" ], - "version": "1.5.9" + "version": "1.5.10" } \ No newline at end of file diff --git a/src/slugcat.lua b/src/slugcat.lua index 4d008cf..7c61257 100644 --- a/src/slugcat.lua +++ b/src/slugcat.lua @@ -125,9 +125,9 @@ SMODS.Joker { name = "The Survivor", text = { "All cards held in hand", - "{C:attention}contribute to scoring {}and", - "are all considered as", - "the {C:attention}first played card", + "{C:attention}contribute to scoring" .. (Cryptid and " {}and" or ""), + Cryptid and "are all considered as" or nil, + Cryptid and "the {C:attention}first played card" or nil, }, }, pos = {x = 0, y = 0},