From 00ed414b1a12d4364abbd16c00189cb012d7d7b4 Mon Sep 17 00:00:00 2001
From: Nyeogmi <economicsbat@gmail.com>
Date: Thu, 8 Feb 2024 17:04:33 -0800
Subject: [PATCH] ... I wasn't actually calling the right generator

---
 board.lua                 | 56 ++++++---------------------------------
 dealer.lua                | 22 +++++----------
 main.p8                   |  8 ++++++
 ruleset.lua               | 14 +++++++---
 simulator/src/main.rs     |  8 ++++++
 simulator/src/pico_rng.rs | 26 ++++++++++++++++++
 6 files changed, 66 insertions(+), 68 deletions(-)

diff --git a/board.lua b/board.lua
index 4090497..76a9343 100644
--- a/board.lua
+++ b/board.lua
@@ -44,63 +44,23 @@ function board:init(ruleset)
 end
 
 function board:deal()
+ local deal=deal(self.ruleset)
  local n_usable_slots=self.ruleset.n_slots - 1
- -- first, pull the aces
- local available={}
- for card=1,#self.ruleset.deck.cards do
-  available[card]=true
- end
+
  for i=1,#self.ruleset.deck.aces do
   local well=self.wells[i]
   local ace=self.ruleset.deck.aces[i]
   well:add(ace)  -- temporarily, so would_accept will work
   self:animate_move_ace_to_well(ace,i)
-  available[ace]=false
  end
 
- local eligible_bottom_row={}
- for card=1,#self.ruleset.deck.cards do
-  local skip
-  if not available[card] then 
-   skip=true
-  else
-   for w in all(self.wells) do
-    if (w:would_accept(card)) skip=true break
-   end
+ local rows=#deal[1]
+ for y=1,rows do
+  for x=1,#deal do
+   local outx=x
+   if (x>n_usable_slots\2) outx+=1
+   self:animate_move_new_card_to_slot(deal[x][y],outx)
   end
-  if (not skip) add(eligible_bottom_row,card)
- end
-
- -- let the animation install the aces for real
- for w in all(self.wells) do
-  w:clear()
- end
-
- function i_to_slot(i)
-  if (i<n_usable_slots\2) return i+1
-  return i+2
- end
-
- local bottom_row={}
- shuf(eligible_bottom_row)
- for i=1,n_usable_slots do
-  local card=eligible_bottom_row[i]
-  add(bottom_row,card)
-  available[card]=false
- end
-
- eligible={}
- for card=1,#self.ruleset.deck.cards do
-  if (available[card]) add(eligible,card)
- end
- shuf(eligible)
- for card in all(bottom_row) do
-  add(eligible,card)
- end
- for i=1,#eligible do
-  local ix=i_to_slot((i-1)%n_usable_slots)
-  local slot=self.slots[ix]
-  self:animate_move_new_card_to_slot(eligible[i],ix)
  end
 end
 
diff --git a/dealer.lua b/dealer.lua
index 843b687..4d101e5 100644
--- a/dealer.lua
+++ b/dealer.lua
@@ -33,26 +33,15 @@ function deal(ruleset)
   local function find_home(card,allow_too_tall) 
    assert(card!=0)
    local acceptors={}
-   local start_points={}
 
    for s=0,#slots do
     local n=#slots[s]
-    if s==exclude then
-     -- don't place it here ever
-    elseif ruleset.deck.instantly_accepted[card] and n==max_height[s]-1 then
-     -- can't place an instantly accepted card at the bottom of a slot
-    else
-     if (accepts(pek(slots[s]),card)) add(acceptors,s)
-     if (n<max_height[s]) add(start_points,s)
-    end
+    if ((allow_too_tall and accepts(pek(slots[s]),card)) or n<max_height[s]) add(acceptors,s)
    end
 
-   local acceptor=rnd(acceptors)
-   local start_point=rnd(start_points)
-   if (acceptor and rnd()>odds) acceptor=nil
-
-   local a=acceptor or start_point or source
-   if (a) add(slots[a],card) return true
+   local a=rnd(acceptors)
+   assert(a)
+   add(slots[a],card) 
   end
 
   local original_pops=#pops
@@ -67,7 +56,7 @@ function deal(ruleset)
   for i=0,#slots do
    while #slots[i]>max_height[i] do
     local card=pop(slots[i])
-    if (not find_home(card,false)) return
+    find_home(card,false)
    end
   end
 
@@ -143,5 +132,6 @@ function deal(ruleset)
  while true do
   local d=deal1()
   if (d) return d
+  print("retrying")
  end
 end
\ No newline at end of file
diff --git a/main.p8 b/main.p8
index 2bc2eea..5c4812b 100644
--- a/main.p8
+++ b/main.p8
@@ -5,11 +5,19 @@ __lua__
 #include animator.lua
 #include board.lua
 #include board_animations.lua
+#include dealer.lua
 #include cursor.lua
 #include layout.lua
 #include ruleset.lua
 #include progression.lua
 #include main.lua
+
+--[[
+srand(2)
+for i=1,10 do
+ print(tostr(rnd(),2))
+end
+stop()]]
 __gfx__
 00000000000000000000000000000000777770000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000007000000777000000070000700070000707070000000000000000000000000000000000000000000000000000000000000000000000000000000000
diff --git a/ruleset.lua b/ruleset.lua
index b6bb5d9..4f207df 100644
--- a/ruleset.lua
+++ b/ruleset.lua
@@ -32,17 +32,20 @@ function ruleset:init(
  local usable_slots = n_slots - 1
  assert(usable_slots%2==0)
 
- local total_n_cards = n_arcana + n_suits * n_cards_per_suit
+ local n_total_cards = n_arcana + n_suits * n_cards_per_suit
  -- aces aren't usable because they are initially placed in the wells
- local usable_n_cards = total_n_cards - self.n_suits
+ local n_usable_cards = n_total_cards - self.n_suits
+
+ self.n_total_cards=n_total_cards
+ self.n_usable_cards=n_usable_cards
 
  -- deal has to be symmetrical
- assert(usable_n_cards % usable_slots == 0, usable_slots-(usable_n_cards%usable_slots))
+ assert(n_usable_cards % usable_slots == 0, usable_slots-(n_usable_cards%usable_slots))
 
  -- these cards would be instantly moved to the wells and
  -- therefore cannot be in the bottom row
  local instantly_placed_cards = self.n_suits + 2
- assert((total_n_cards-instantly_placed_cards)-usable_slots >= 0)
+ assert((n_total_cards-instantly_placed_cards)-usable_slots >= 0)
 
  self:generate_deck()
  self:generate_layouts()
@@ -55,6 +58,7 @@ function ruleset:generate_deck()
   aces={},
   suits={},
   cards={},
+  instantly_accepted={},
   rank_name="a23456789tjqk"
  }
  self.deck=deck
@@ -67,12 +71,14 @@ function ruleset:generate_deck()
   for rank=1,self.n_cards_per_suit do
    add(deck.cards,{suit=suit,rank=rank})
    if (rank==1) add(deck.aces,#deck.cards)
+   if (rank==2) deck.instantly_accepted[#deck.cards]=true
   end
  end
 
  -- arcana
  for rank=0,self.n_arcana-1 do
   add(deck.cards,{suit="a",rank=rank})
+  if (rank==0 or rank==self.n_arcana-1) deck.instantly_accepted[#deck.cards]=true
  end
 
  function deck:draw_card(x,y,c,shadow)
diff --git a/simulator/src/main.rs b/simulator/src/main.rs
index 6fb7d82..f4f3b63 100644
--- a/simulator/src/main.rs
+++ b/simulator/src/main.rs
@@ -1,4 +1,5 @@
 use board::Board;
+use pico_rng::PicoRng;
 use ruleset::Ruleset;
 use seen::Seen;
 
@@ -6,12 +7,19 @@ use crate::smart_dealer::Deal;
 
 mod board;
 mod ruleset;
+mod pico_rng;
 mod seen;
 mod smart_dealer;
 mod zobrist;
 
 
 fn main() {
+    let mut rng = PicoRng::srand(0x20000);
+    for _ in 0..10 { 
+        println!("{}", rng.rnd(0x10000));
+    }
+    return;
+
     let ruleset = Ruleset { 
         n_slots: 11, 
         n_suits: 5, 
diff --git a/simulator/src/pico_rng.rs b/simulator/src/pico_rng.rs
index e69de29..f1094b3 100644
--- a/simulator/src/pico_rng.rs
+++ b/simulator/src/pico_rng.rs
@@ -0,0 +1,26 @@
+pub struct PicoRng {
+    hi: u32,
+    lo: u32
+}
+
+impl PicoRng {
+    // https://www.lexaloffle.com/bbs/?tid=51113
+    pub fn srand(seed: u32) -> PicoRng {
+        let mut rng = if seed == 0 {
+            PicoRng { hi: 0x60009755, lo: 0xdeadbeef }
+        } else {
+            PicoRng { hi: seed ^ 0xbead29ba, lo: seed }
+        };
+        for _ in 0..0x20 {
+            rng.rnd(0x10000);
+        }
+        return rng
+    }
+
+    pub fn rnd(&mut self, n: u32) -> u32 {
+        self.hi = self.hi.rotate_left(0x10).wrapping_add(self.lo);
+        self.lo += self.hi;
+        return self.hi % n
+
+    }
+}
\ No newline at end of file