diff --git a/manifest.json b/manifest.json index 1456592..7af4291 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "name": "Roland", "prefix": "Roland", "author": ["Emik"], - "version": "1.0.0", + "version": "1.0.1", "badge_colour": "8BE9FD", "main_file": "src/main.lua", "badge_text_colour": "44475A", diff --git a/src/challenge.lua b/src/challenge.lua index e1f573c..3ac361e 100644 --- a/src/challenge.lua +++ b/src/challenge.lua @@ -7,35 +7,38 @@ SMODS.Challenge { restrictions = jokerful } -if Jen or Jane then - local deck = Jen and "b_jen_nitro" or "b_jane_nitro" - local card = Jen and "j_jen_saint" or "b_jane_nitro" +local deck = {} +local card = {eternal = true, cry_absolute = true} - SMODS.Challenge { - key = "Ascension", - deck = {type = deck}, - rules = {custom = {{id = "Roland_Saint"}, {id = "Roland_Accelerated"}}}, - jokers = {{id = card, eternal = true}}, - } +SMODS.Challenge { + key = "Ascension", + deck = {type = deck}, + rules = {custom = {{id = "Roland_Saint"}, {id = "Roland_Accelerated"}}}, + jokers = {card}, +} - SMODS.Challenge { - key = "Soaring", - deck = {type = deck}, - sleeve = "sleeve_cry_equilibrium_sleeve", - rules = {custom = {{id = "Roland_Saint"}, {id = "Roland_Accelerated"}}}, - jokers = {{id = card, eternal = true}}, - } +SMODS.Challenge { + key = "Soaring", + deck = {type = deck}, + sleeve = "sleeve_cry_equilibrium_sleeve", + rules = {custom = {{id = "Roland_Saint"}, {id = "Roland_Accelerated"}}}, + jokers = {card}, +} - SMODS.Challenge { - key = "Balanced_Jokers", - rules = {custom = {{id = "Roland_Balanced_Jokers"}}}, - restrictions = balanced_jokers - } -end +SMODS.Challenge { + key = "Balanced_Jokers", + rules = {custom = {{id = "Roland_Balanced_Jokers"}}}, + restrictions = balanced_jokers +} G.E_MANAGER:add_event(Event { trigger = "immediate", func = function() + if Jen or Jane then + deck.type = Jen and "b_jen_nitro" or "b_jane_nitro" + card.id = Jen and "j_jen_saint" or "j_jane_saint" + end + jokerful.banned_cards = F.map( F.filter( G.P_CENTERS, diff --git a/src/joker.lua b/src/joker.lua index e2d27b4..da5ad5b 100644 --- a/src/joker.lua +++ b/src/joker.lua @@ -55,7 +55,7 @@ SMODS.Joker { local quotes = loc_self.quotes local merge = G.jokers and F.count(F.filter(G.jokers.cards, is_mergeable_with(card))) > 1 and loc_self.merge or {} local normal = (merge[1] or (Jen or Jane or {}).sinister) and {} or quotes.normal[math.random(#quotes.normal)] - local scared = (merge[1] or not (Jen or Jane or {}).sinister) and {} or quotes.normal[math.random(#quotes.normal)] + local scared = (merge[1] or not (Jen or Jane or {}).sinister) and {} or quotes.scared[math.random(#quotes.scared)] return {vars = { card.ability.extra.level_up_by,