From 5dc6f763cd7b0c26c3937fe07bc22ce9c67331cd Mon Sep 17 00:00:00 2001
From: Nyeogmi <economicsbat@gmail.com>
Date: Thu, 8 Feb 2024 13:12:34 -0800
Subject: [PATCH] Possibly improve color choices

---
 main.lua                      | 8 ++++++++
 progression.lua               | 4 ++--
 ruleset.lua                   | 2 +-
 simulator/src/main.rs         | 4 ++--
 simulator/src/smart_dealer.rs | 6 ++++--
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/main.lua b/main.lua
index c72caee..e7e965c 100644
--- a/main.lua
+++ b/main.lua
@@ -20,4 +20,12 @@ end
 function main:draw()
  cls(13)
  self.board:draw()
+ pal(1,0,1)
+ pal(3,-5,1)
+ pal(4,-7,1)
+ pal(12,12,1)
+ pal(11,-5,1)
+ pal(13,-8,1)
+ pal(14,5,1)
+ pal(15,-9,1)
 end
diff --git a/progression.lua b/progression.lua
index 8aa34e3..36a6389 100644
--- a/progression.lua
+++ b/progression.lua
@@ -10,7 +10,7 @@ progression={
  -- level 5
  -- ruleset:new(9,3,11,18),
  -- fortune's foundation
- ruleset:new(11,4,13,22)
+ -- ruleset:new(11,4,13,22)
  -- harder than fortune's foundation
- -- ruleset:new(11,5,10,25)
+ ruleset:new(11,5,10,25)
 }
\ No newline at end of file
diff --git a/ruleset.lua b/ruleset.lua
index 59903ea..626ff3d 100644
--- a/ruleset.lua
+++ b/ruleset.lua
@@ -98,7 +98,7 @@ function ruleset:generate_deck()
   if (meta.suit=='s') s,fg=1,12
   if (meta.suit=='c') s,fg=2,2
   if (meta.suit=='w') s,fg=3,3
-  if (meta.suit=='b') s,fg=3,0
+  if (meta.suit=='b') s,fg=4,14
   if (meta.suit=='a') fg=15
 
   if meta.suit=='a' then
diff --git a/simulator/src/main.rs b/simulator/src/main.rs
index 04923c0..6fb7d82 100644
--- a/simulator/src/main.rs
+++ b/simulator/src/main.rs
@@ -12,20 +12,20 @@ mod zobrist;
 
 
 fn main() {
-    /*
     let ruleset = Ruleset { 
         n_slots: 11, 
         n_suits: 5, 
         n_cards_per_suit: 10, 
         n_arcana: 25 
     };
-    */
+    /*
     let ruleset = Ruleset { 
         n_slots: 11, 
         n_suits: 4, 
         n_cards_per_suit: 13, 
         n_arcana: 22 
     };
+    */
     /* 
     let ruleset = Ruleset { 
         n_slots: 5, 
diff --git a/simulator/src/smart_dealer.rs b/simulator/src/smart_dealer.rs
index 45cbad8..7330e9d 100644
--- a/simulator/src/smart_dealer.rs
+++ b/simulator/src/smart_dealer.rs
@@ -1,6 +1,6 @@
 use rand::{seq::SliceRandom, Rng};
 
-use crate::ruleset::{Card, Setup};
+use crate::ruleset::{self, Card, Setup};
 
 pub struct Deal {
     pub slots: Vec<Vec<Card>>,
@@ -53,7 +53,9 @@ impl Deal {
                 shuffles = extra_shuf
             }
         }
-        for _ in shuffles..2 {
+        // TODO: Use this in the game too
+        let max_shuffles = 2; // if setup.ruleset.n_suits < 5 { 2 } else { 1 };
+        for _ in shuffles..max_shuffles {
             slots.choose_mut(rng).unwrap().shuffle(rng);
         }