From 5980c6bb2273edb9e33acfa0865a6257411a762a Mon Sep 17 00:00:00 2001
From: Chris Mekelburg <chrismekelburg@1.local>
Date: Tue, 10 Dec 2024 21:36:09 -0500
Subject: [PATCH] trying to import state to help me determine the number of
 mines

---
 gamefiles/__pycache__/board.cpython-312.pyc   | Bin 4404 -> 4981 bytes
 .../__pycache__/minecounter.cpython-312.pyc   | Bin 542 -> 588 bytes
 gamefiles/board.py                            |  28 ++++++++++++++----
 gamefiles/minecounter.py                      |  10 ++++---
 gamefiles/nav_game.py                         |  12 ++++----
 5 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/gamefiles/__pycache__/board.cpython-312.pyc b/gamefiles/__pycache__/board.cpython-312.pyc
index 75bc6ed81d6b49113a6a34ab4bb97a037b85806b..3d1da771dcbe20d6eabcad0590f38b8f950b472f 100644
GIT binary patch
delta 1898
zcmZWqYiv|S6rQ<{?Y;ZByDfd}ZcADE0B)5cN+}>9u6-aWtx_epK$~^%(k!&Qb?$9U
z$u?aLF(s*?byU#!_$!j|Ly3t$@t28-X#>&C4OOD?NB<aXeI)+!oY{6MagzP+nKS3i
zIp55gv$vZ5+P3|>K)_32ocR0HNHR#suQ*vB>YA|X%x~}LvWTUQYGZmrr^NCkyjF#!
zjYyVe>409#2k5r~BhrYH@JXbXSjHt{1#d{DO%ndekXbqJ>=-bq>mSQx)5EFUMAk{O
z<tM>n8DlMDD$CUfkP2CDM6eKc0Hoko9&}AwJv0C1z;4TTi6nwLvHb82O$JQERpYrN
zvwBiW*@X~HMTXyMJKsrnRZNoWwBMBZYqY+>R9wYQkDg-~oz)=J0@&!zzowJZsJH6?
z3Zz&Qol$1J#o7k=_=?e%8RhNZDlC!I8d;P@BoS>0CRa(Go)_vzVM@wN7L9;%N_NWL
zUF57m$QhVVDN|}*&MVUwU}Do*e_l;VlnfGuIAv;s#FYA7bug7<X;XGp+etcU*VEU1
zvb%54)sH`WYWVo`{oRA6ham%38A*<%-Kx|CW9h6jY@^?>l}R~n;1Qjxj%LO(j!U!l
zv<DnxVz4lXtODR-l{n<~jkj43dV4<roYUs5pC&#?ENIbUxb3sf#qd)zfuF;TmygbL
z&+RS-8?H^<3APmL!tZDgR1(?pr-y_h3tE^(!TXVugxGxA@OX~FtzRYlim@X)B{}QW
zN%GQ-wQ`^&Pxv23HJ_7wbvkS#MqYln?)dl@($h4+f0ue`5HP|A<en<cl`~mKkaE>=
z1~PwNZmY)A5_RC}*@>}X<Z1Ko<wG>g{mRznW>~gw0Tjr+>bh&nk708$Y~HDEo6+xS
zftk!*EzI{RFKzvHaxs2tA#r*!etMzl><^)#YcIZAJ(qm1ZXq-@qXO`oN=xOC?T4*y
z*Hp#pmD~HP;xYb<vWI_YZ04`4&HSW#E3^sLO^+*&=0@0KAoC{Ap+1pg3}!Z#Pb?;`
z$JNJ2las^F1j}9wmM*ERXh+*~0B}Q^|B7~5o2$OsINx|zi}9PDmuZy$q(%7Vir=(t
zU}UPSjeE6LUpWqYoFCBYqoNA-fyG6m6d-9?;)FVQPRoj2X7`AUWwsm4*bxB8J)Jcb
zQHCsr3Yuh3z*jspEH4)3pXkl>F#ksXs9Cs6tP2bTVTOgZktgfqZ+PozoPX?XEhm02
z#SVfUW{!?nx$F>vf^ZlBmNw8q?K1%IaI(qN1se+sQz;!K+Y8h6Lqv|ks0T<6@~pqU
zM0D>)qDOJVIKW1t>^ao#0@z5kFVIQ{I16;rZvJ`T%sSy?Xp8;l|AafZX*AG5-eVx)
zQRAy#5n6FomduW%ANDWTlN=vUXRWm)pdxa1#>wQewo5ZEJ-;Ch4AjOm!3H|T-wM7^
zfe*0XtmI3<_Gv-p2wGs15-)^d!)6B%@cv8J(}@xu6%)yKpoGVNorw2bY8sWOMZorM
z_XAuaMPpN;x9ANPx{JC|=vq-^wROetsF9VBuGUH`wfxP{&L&Jrc=nqCwi74VTA9dB
zT<a0O7^<0eefUP#{#Z)MZb3WzClT)KBuZj8EZ~2&gJU^sVl;i2y#iBgBR1~&K&F%~
zkxfgaZi&<^k?0a>x$id$`h6-D;)RMLl?x{dTKS_CUM=Vk^jg&`6+HhKHl>jjXxB6%
GLj4Cdj-KrR

delta 1339
zcmZWpO>7%Q6rQnn*K4nT){bMxc8dHHH*DIb1=9A=1gR+{a7oLrloHk2W=(1u+hI0A
zauui#IRvSNmIs0ZP>xhRfq(<Io>3u@5VcnLggAo|A*7yoZ``<+7-_$mo%i0n?|W}{
z|2g<war~!9B*bvMd->(%Um}eCK`;A5d9>Jj;nw)^5g(glj=ISl?XIt9xS+QJmVWE2
zCqLpT{yL=jxkEwb7@O=utQEE*o;usKh4cK9x_=<f6za!kZyG-3M~63*4OXFdIa=%v
zpSKja&vQq-U}L>rsn;4+*HS&jt**Q&4D=FV0;I}B6v3s#^Pu=zlVot8KxnhhaCS?%
z9_pk<aWXpDF`QzZOmR!O5#2)%w&VxfO!`6`V!=|zzt*R);lIntfice3RCrH0#RKr8
zGRK49Q!88rSDlE)(EOMJe51~A6aG>Q#t<6ZFA&-cp3z<{Zl7P+nO)d^V{vD8al3f&
zH?#8DOCKk1+MlGi&B~UF0AFikX2m6C-zQF=Qto9Evkbc06z6a+nuOb?4wHcgBh)2J
z^ZYB#WzSe!7mW&*=TcR`us(B+_;|{)U9Y-S-+W$}v=dxiv0D{#z8aIQnCx$iqTRiW
zfVI-YAL{SxH<J(Ig`IfeSG@>d>aXzx{2a<aB>1PEL^n$nDR>wx8&di~+!1M*2<5Vr
zNQ@y|jrLO5jw8EPf=Z|%Pq{uN$@>K*6-N+IMzvunqJNmjZIMHRt03fY2opXqO8hW<
zYkXdk;Xd&cg;UQ(nOp~yiW0mX&hcY#BV6ti|9weV=ts;cMkAOYpd8{50-E{^M4EOF
zBY3LYu$Qj%E>@2VnTiPeWh9N#X$nQY0vDsXp3oD6LXT6_QG`LE;u!5_5eB7B$I5&L
zF2zprr{T6Q14j7FzUY(WFK_$*L>C}qj`GuR!X(j)<_~i+z2d3DZY)<He=VM7udY@b
z&LbjtFPd&`t=4R~9<O=)tpO^OEd>klQGNy9iJuQ7aAV#w;eLGbniNFs6LEqA1mgtM
z{$6)Vw4zE0$-6)+s{S1&=p=b9g-$Di06y-E2%D@E9cs^YLb3MQPB7YjZdXy%(rz@M
zrgjsmny1wP*i4kK$x|qH-U^BloCSTkLQ<1`mHg<R;AvO|r&;ecUgkVQu6-U4_33)k
qSzoC>E6$>UzIvB5{q5(RciB*vrMqmn%d-D!HO@1;3{lI-`2PTcnG@3h

diff --git a/gamefiles/__pycache__/minecounter.cpython-312.pyc b/gamefiles/__pycache__/minecounter.cpython-312.pyc
index 3d6fc4c3fe16f16c5e4c7a7a48c142d534a70975..5b4a0eedbe7327fb299c65b68b730179885203a0 100644
GIT binary patch
delta 310
zcmbQoa)yQXG%qg~0}$-{7?J*LBCi%B(?knnM*fL88fI=l;pq%D3@MC~Kvped2}m6n
zxG==>F)+k10Y#Z=nQItpn6iQFV#Xex8s>=yMBSMDZm|X@=NF}FGTmbHaSe0z3BJYY
z>lhL5>*?njtjThVwYVg)B=r_=a%oXfYF<fvF-Y+()||}T%#vG-dBrS1YZNB4Fs9b?
z<Ywlj#wX{O=9Q!t6$t~yxq-M?4@fjH+z^qRp+3>C!S}w1R3}FVYe(S?ZiyMDm$?;g
z2#a)id|+h|mHxuUz$1ErMdUM32ZNs`a}h6)F5&?ZAk$Vd6p4V?LO|jdhfQvNN@-52
bU6B}&%Lv4iZ!?<lvNDQ(;NxNB0ILK5Y^6=5

delta 267
zcmX@ZGLMD#G%qg~0}%X44@%!Ykyne6VWNdGqxZxdjd~lP@N|X}kSrLuFvRjPFvKu1
zFw`>EGSx8DFlGbU#f&{XHB8A&j10jHEDR+;5eNuo&}8(}WV*%X;~M7b6MT!)*D)gA
z*VE56Sd;k{YjJXZQR*$$oXp(Jl3R><#mqoW3JMCp;`Kv|Q;UlAlQW7Yn=poHapslg
z#^+|{r4|<n0+nzBaj^=JXkfT6BGt*!!P-%HgIi#NX}9g<gN)K@JV2=;kRq_^l?+8f
kAhrOI_{Cw9o1apelWJEaGMS0VmY0Q5^aB?UBL`Rs0CG$`#sB~S

diff --git a/gamefiles/board.py b/gamefiles/board.py
index 50ca5ae..3798bcd 100644
--- a/gamefiles/board.py
+++ b/gamefiles/board.py
@@ -2,31 +2,49 @@ from man import Man
 from snack import Snack
 from mine import Mine
 from random import shuffle
+from minecounter import mine_counter
 
+MAX_MINES = 50
+LEVELS = [
+[5, 10],
+[10, 20],
+[15, 30],
+[100, 40]
+]
 
 class Board:
     display = False
     snack=False
     mine=False
 
-    def __init__(self,width, height,num_snacks,num_mines):
+    def __init__(self,width, height,num_snacks):
         self.width = width
         self.height = height
         self.num_snacks = num_snacks
-        self.num_mines = num_mines
      
+        #self.num_mines = num_mines
+     
+    def mine_counter(self,game):
+        current_score_dict = game.state
+        current_score = current_score_dict['Score']
+        for limit, n in LEVELS:
+            if current_score < limit: 
+                return n
+        return MAX_MINES
     
-    def get_agents(self,num_snacks,num_mines):
+    def get_agents(self,num_snacks):
+        num_mines = int(self.mine_counter)
+        print(num_mines)
         all_positions = self.get_all_positions()
         shuffle(all_positions)
         man= [Man(all_positions[0])]
         snacks = [Snack(p) for p in all_positions[1:(num_snacks+1)]]
-        mines = [Mine(p) for p in all_positions[(num_snacks + 2):(num_snacks  + num_mines +2)]]
+        mines = [Mine(p) for p in all_positions[(num_snacks + 2):(num_snacks + num_mines +2)]]
         agents = man + snacks + mines + [self]
         return agents
     
     def play_turn(self,game):
-        game.log(game.turn_number)
+        game.log(self.num_mines)
         while self.game_needs_snacks(game):
             self.add_snack(game)
         while self.game_needs_mines(game):
diff --git a/gamefiles/minecounter.py b/gamefiles/minecounter.py
index 6406dc5..2852778 100644
--- a/gamefiles/minecounter.py
+++ b/gamefiles/minecounter.py
@@ -3,16 +3,18 @@
 MAX_MINES = 50
 LEVELS = [
 [5, 10],
-[50, 20],
-[75, 30],
+[10, 20],
+[15, 30],
 [100, 40]
 ]
 
-def num_mines(score):
+def mine_counter(state):
+    current_score = state['Score']
     for limit, n in LEVELS:
-        if score < limit: 
+        if current_score < limit: 
             return n
     return MAX_MINES
+
 '''
     if score < 5:
         num_mines = 10
diff --git a/gamefiles/nav_game.py b/gamefiles/nav_game.py
index fd947fd..07a729f 100644
--- a/gamefiles/nav_game.py
+++ b/gamefiles/nav_game.py
@@ -1,18 +1,18 @@
 from retro.game import Game
 from board import Board
-from minecounter import num_mines
+
 
 width = 25
 height = 25
 state= {"Score":0}
-score =state["Score"]
+score = state["Score"]
 num_snacks = 10
-num_mines = num_mines(score)
-board = Board(width,height,num_snacks,num_mines)
+board = Board(width,height,num_snacks)
 
 game = Game(
-    board.get_agents(num_snacks, num_mines),
+    board.get_agents(num_snacks),
       state,
       board_size = (width, height),debug=True
 )
-game.play()
\ No newline at end of file
+game.play()
+#print(board.num_mines)
\ No newline at end of file