From 9b0312beeda624ddcafff0bd9c9da7a3e227908b Mon Sep 17 00:00:00 2001
From: Emik <emik.cuber@gmail.com>
Date: Wed, 3 Jun 2026 22:31:44 +0200
Subject: [PATCH] Nerf challenges

---
 manifest.json     |  2 +-
 src/challenge.lua | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/manifest.json b/manifest.json
index be5dfea..e34621c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "id": "Roland",
     "name": "Roland",
     "prefix": "Roland",
-    "version": "2.8.2",
+    "version": "2.8.3",
     "badge_colour": "8BE9FD",
     "display_name": "Roland",
     "main_file": "src/main.lua",
diff --git a/src/challenge.lua b/src/challenge.lua
index f67f124..9b788b0 100644
--- a/src/challenge.lua
+++ b/src/challenge.lua
@@ -91,9 +91,12 @@ SMODS.Challenge {
     pronouns = "she_them",
 }
 
+local starting_jokers = f(5):map(f().const {id = "j_joker"}):table()
+
 SMODS.Challenge {
     key = "Eternally_Amber",
     rules = {custom = {{id = "Roland_Eternally_Amber"}, {id = "Roland_Showdown_Amber"}}},
+    jokers = starting_jokers,
     restrictions = amber,
     pronouns = "they_them",
     calculate = function(_, context)
@@ -132,6 +135,7 @@ SMODS.Challenge {
 SMODS.Challenge {
     key = "Eternally_Cerulean",
     rules = {custom = {{id = "Roland_Eternally_Cerulean"}, {id = "Roland_Showdown_Cerulean"}}},
+    jokers = starting_jokers,
     restrictions = cerulean,
     pronouns = "she_her",
     calculate = function(_, context)
@@ -158,6 +162,7 @@ SMODS.Challenge {
 SMODS.Challenge {
     key = "Eternally_Crimson",
     rules = {custom = {{id = "Roland_Eternally_Crimson"}, {id = "Roland_Showdown_Crimson"}}},
+    jokers = starting_jokers,
     restrictions = crimson,
     pronouns = "she_her",
     calculate = function(_, context)
@@ -218,6 +223,7 @@ SMODS.Challenge {
 SMODS.Challenge {
     key = "Eternally_Verdant",
     rules = {custom = {{id = "Roland_Eternally_Verdant"}, {id = "Roland_Showdown_Verdant"}}},
+    jokers = starting_jokers,
     restrictions = verdant,
     pronouns = "she_her",
     calculate = function(_, context)
@@ -240,13 +246,17 @@ SMODS.Challenge {
 SMODS.Challenge {
     key = "Eternally_Violet",
     rules = {custom = {{id = "Roland_Eternally_Violet"}, {id = "Roland_Showdown_Violet"}}},
+    jokers = starting_jokers,
     restrictions = violet,
     pronouns = "she_they",
     calculate = function(_, context)
-        if context.setting_blind then
-            G.GAME.blind.chips = G.GAME.blind.chips * 6
-            G.GAME.blind.chip_text = number_format(G.GAME.blind.chips)
+        if not context.setting_blind then
+            return
         end
+
+        local mult = G.GAME.blind.mult < 6 and G.GAME.blind.mult or 1
+        G.GAME.blind.chips = G.GAME.blind.chips * 6 / mult
+        G.GAME.blind.chip_text = number_format(G.GAME.blind.chips)
     end,
 }