From b8a7086c35e7e06d56ce2ca006ea2630d4515ff8 Mon Sep 17 00:00:00 2001
From: Emik <emik.lakunishok@gmail.com>
Date: Tue, 25 Mar 2025 22:27:38 +0100
Subject: [PATCH] Fix all challenges

---
 manifest.json     |  4 ++--
 src/challenge.lua | 23 +++++++++++++----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/manifest.json b/manifest.json
index 7421bb2..cc63ea3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,12 +4,12 @@
     "name": "Roland",
     "prefix": "Roland",
     "author": ["Emik"],
-    "version": "1.1.0",
+    "version": "1.2.0",
     "badge_colour": "8BE9FD",
     "main_file": "src/main.lua",
     "badge_text_colour": "44475A",
     "display_name": "Roland (Emik)",
-    "description": "Adds the most important joker, a wild spectral, and a small handful of challenges.",
+    "description": "Adds several disconnected funny ideas I had in my head that I couldn't resist implementing in the game.",
     "provides": [],
     "conflicts": [],
     "dependencies": [
diff --git a/src/challenge.lua b/src/challenge.lua
index 3ac361e..a629f3c 100644
--- a/src/challenge.lua
+++ b/src/challenge.lua
@@ -12,23 +12,23 @@ local card = {eternal = true, cry_absolute = true}
 
 SMODS.Challenge {
     key = "Ascension",
-    deck = {type = deck},
-    rules = {custom = {{id = "Roland_Saint"}, {id = "Roland_Accelerated"}}},
+    deck = deck,
     jokers = {card},
+    rules = {custom = {{id = "Roland_Saint"}, {id = "Roland_Accelerated"}}},
 }
 
 SMODS.Challenge {
     key = "Soaring",
-    deck = {type = deck},
+    deck = deck,
+    jokers = {card},
     sleeve = "sleeve_cry_equilibrium_sleeve",
     rules = {custom = {{id = "Roland_Saint"}, {id = "Roland_Accelerated"}}},
-    jokers = {card},
 }
 
 SMODS.Challenge {
     key = "Balanced_Jokers",
+    restrictions = balanced_jokers,
     rules = {custom = {{id = "Roland_Balanced_Jokers"}}},
-    restrictions = balanced_jokers
 }
 
 G.E_MANAGER:add_event(Event {
@@ -39,17 +39,20 @@ G.E_MANAGER:add_event(Event {
             card.id = Jen and "j_jen_saint" or "j_jane_saint"
         end
 
-        jokerful.banned_cards = F.map(
+        F.foreach(
             F.filter(
                 G.P_CENTERS,
                 function (v) return v.set == "Joker" end
             ),
-            function (v) return { id = v.key } end
+            function (v) table.insert(jokerful.banned_cards, {id = v.key}) end
         )
 
-        balanced_jokers.banned_cards = F.filter(
-            jokerful.banned_cards,
-            function (v) return v.id:sub(1, 6) == "j_cry_" or v.id:sub(1, 6) == "j_jen_" end
+        F.foreach(
+            F.filter(
+                jokerful.banned_cards,
+                function (v) return v.id:sub(1, 6) == "j_cry_" or v.id:sub(1, 6) == "j_jen_" end
+            ),
+            function (v) table.insert(balanced_jokers.banned_cards, {id = v.key}) end
         )
 
         return true