From d3936b5723f04a4911f5dc596b0a466be16b1868 Mon Sep 17 00:00:00 2001
From: Matteo Benedetto <me@enne2.net>
Date: Sun, 15 Dec 2024 22:02:57 +0100
Subject: [PATCH] Riduci il ritardo di rendering da 50 a 10 ms, modifica il
 numero di ratti generati da 50 a 5 e aggiorna la tolleranza di
 sovrapposizione in base alla dimensione della cella

---
 engine/sdl2.py                        |   6 +++---
 rats.py                               |   2 +-
 units/__pycache__/rat.cpython-313.pyc | Bin 9945 -> 9975 bytes
 units/rat.py                          |   3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/engine/sdl2.py b/engine/sdl2.py
index cabdf80..8e3d150 100644
--- a/engine/sdl2.py
+++ b/engine/sdl2.py
@@ -12,9 +12,9 @@ class GameWindow:
         self.width = width * cell_size
         self.height = height * cell_size
         print(f"Screen size: {self.width}x{self.height}")
-        self.delay = 50
+        self.delay = 10
         sdl2.ext.init()
-        self.window = sdl2.ext.Window(title=title, size=(self.width, self.height), flags=sdl2.SDL_WINDOW_FULLSCREEN)
+        self.window = sdl2.ext.Window(title=title, size=(self.width, self.height),)# flags=sdl2.SDL_WINDOW_FULLSCREEN)
         self.window.show()
         self.renderer = sdl2.ext.Renderer(self.window, flags=sdl2.SDL_RENDERER_ACCELERATED)
         self.factory = sdl2.ext.SpriteFactory(renderer=self.renderer)
@@ -85,4 +85,4 @@ class GameWindow:
                     self.running = False
             # Disegna qui gli sprite
             self.renderer.present()
-#            time.sleep(self.delay / 1000)
+            sdl2.SDL_Delay(self.delay)
diff --git a/rats.py b/rats.py
index eb72f6e..1b8e3a5 100644
--- a/rats.py
+++ b/rats.py
@@ -17,7 +17,7 @@ class MiceMaze:
         self.units = {}
         self.unit_positions = {}
         self.unit_positions_before = {}
-        for _ in range(50):
+        for _ in range(5):
             self.new_rat()
 
     def new_rat(self, position=None):
diff --git a/units/__pycache__/rat.cpython-313.pyc b/units/__pycache__/rat.cpython-313.pyc
index d202cc54113a7ed59ec30117bc74f86f4330329f..d749aa5c496fc1b28aad3abc352db45c57dea403 100644
GIT binary patch
delta 2202
zcmaJ?TWphc6#p*0Zfn=|vR>A8-PKhFi~tG~#|mq=$-1$QA>zzu*M5}3);6bI2FL=$
zsNf!8{FTHf(3qIT7&Ut&KInsqF~&_|9ADzIL1QqoWQmE1=lnZ&1N}doobPwe`Jem$
zyB}MLSsz&}Wdfcz4lC)}>RGEtgxRNdMLj};Fl_P(!{$+OuS^Pp049!>AzD6aT0_ko
ztw7YW0WC|*A?xf1+dlu{h*WMPYdeuj)+&d^iup5gNVIUogK$U>K6XdfD*D+sx+`K}
z{)qlpaql*gNT4G-iO3okGM8?ndo_6?k=G0pi6Ugqfrp(jHdXrwH)qvM`t(>13eZH>
z&Fn*Cy}?gx75mnB58d20^+_%lDO<ul5#?BKJTlxn*xwD+?C-MBekbX=Nvwz5WHtp=
z1n{U^2{orOpeBo%Ty{<b@>vj(1i{ag@};@}@<{^zJqBc`l#iA%k$2g3gPRRCy3Lqc
zRvZ!HI`*a2AsSe&!ljo+q_~-dtuFSP$-x#}PIkBPY4)(fB|nb4S)j@BnCyM)lWj`)
znoXtT5PHPk2*x0f$Z;q6tfRcQoQ@NMkU|`Fc${8JhMx|sM*?$*?Lny!uV%kn-Nr~h
zjhdW)@ml`l6EBR2+i}cDH$}Rmf^gzAVt7NxJFD0!#9rQ_mq+aU7QGAH508{r$6~8B
z-r<pL!o;sxr`IEm$Sh(Tsg(Dwb|Q%B#`Gj=!3e2oTTaIm#)EA_wFW^Lme?=0I%6rf
zMy!tG(&npr1)*FB3TYuE4?Lg&)pVyOlV?MA;KON7s^jBIA#*_mnlpHgGz{vwqMA)<
z*2!$9sN{2n49!qMlhbOkG+wk6nrpLI8B<T?K<$P~y2wEqdeT6<f_e_T1jwn3N(3N^
zpP>pqm0H!{@kqQsd{j9$*dK|92M$Nry{dM51*!x$9GqLHy{YC?tkh*;$sfGk_g>#m
z{+)~douBPm^zT_Pd0D4@rFo&IZPC^CqpfYpX8%u~opel#0k-70ALVr@%a13{D+Rtq
z{XEiqF3&TWlX#FYglGY0149D7qywa8j3<gaFsTGvaUR5tebzOj+un#0z~-zHG6H%m
zAV`Fo03Ap)DLVy2?4j4^qIF$w0L19i#sa?G`)IwPhX}8ESqc(UN@gOFR!b$ea)8!6
zkxh@Q`0~)qKo`628*ovanvOIy6Au)*)AN7&^iq_zAM4MXPQ8LIBGe>47^Nn1=WDMZ
zoF!>B5!^HZ3zKBe*B*3HpMYn;-=9PDd6Lc6K2u$TEPr#lN+mOq$i#lGZK?6;+m`p~
z^vx?)yFM!YArJ)$3QV)#d)Z9=ewGgy#Ea~^dM~>X=#G_>jJu-h%;AenKpPPrA)h+#
zP>&dm&E=9)ve7KD#JIXcQ8F~q$~3F5Yrt-G*NLJ#jq;EQ_R~!?3-AgNCmRiVcJCy%
z9f@WbON?dI0x0;gX$)wPH8a1S7V8T8D0tMut1FfI=wzQX*X`hulP<hQ<RX!2Bpb_f
zi9jM3*-(8Aj^{+ZB3{D^yxGa4yGru)I=oKiPfE5js!nW7_iZ-Y(2nVT)o@po9yr;h
zCSQ8(Ld|k0eCQ>mZ{S!YemvaITg!hcr3b>8Ri_ldpV#^r@cM+wIlWn{+t7)uW?OZf
zhg=fWL{YtQv-y^r7efa;dhV8w_lB~N?f;ZzhQvg!vA>#Yl5`#a43+bx1o~$I@05i&
zdcxoUk++E4B*F)emzVCD6H1fD*TZyRBA1#RS3BVriYTMP0Gn=UwJ#g8q8OE~HZ9}-
P51Hjx*%vJy9l8Gpe8<`f

delta 2166
zcmaJ?TWph696#sl*ZX?Ete0(V=QgQy1LTr`li5MXhHE#!U4Vd;Zv9rOYd23jSpYK#
zi4I9L%TbJw7<k;9h8Ke`#5d!E7%#!^Mez;wVTm;}F%kd&(`A$>o`>Ie&i{Tp=UY$z
zkhcGBvsnnNuR2Z^{`Rfd1N8Nkr*|A4Gci+uw39J&h>TfI(A_!|B7~U*)e6+66Xs2-
zMNn-(wKq_$1zp^+^3hi5ftO#81wZ+5w`6sp5f6fsM|4SQyOq<$sZCIVK#uEKn13K|
zp{@Lme33?O_3MA3G{L)#Ede2f1~gqMH?J8=xhg9zvLMeHJN#j!o6BmkaC&NvRahtb
z=;GInF+(eE-TZUoH(>9oX-M+<QP`F|l**0|Dygx-k>P`^nb$1wy*`u;AY0Go7Rq_%
zMuPAhN2)nrWa@OaI9Fb!41HE8K$NxeN$Wit;oF*m($6w~s0+0mmw+SIJ}{C4xdPcn
z%5;J%dQSZw9Z?MYV!*?tW-qlOg-4=39<cdzPnLLSd*)x<OE!<B{J(()5wPH(9&(5d
zP7qR-CM3nZ5sjOVI{k*cmyijG-#10L(P8H|9UjYqOvwDM`AHz(aCn!*adH0I(Y?p9
zkYaVi6k(cqNIHFrkfTQ$cp$Owy$xO&c!wK!je6&Sce;VssP{HRMHK7?m;KJo+I{J0
zF@B5zZ)Q=iDbVTn{H0(366CK1y*y&j^MbS2A??P7!HPl&(!NHKpPW|xvxJOMzUGY3
zgWTx~PCPDtln^T@7D!ymX!6X$^s8|<!y2$&0L`E-R#li8F{Ac{a<Q77pQ{vcS}K~Z
zpjPXH6y)!?!UvqF2DK)dYh*H|3@1mk<0Hc<C7C&p()6edIu&)1g-}M9FRBQP4ZtyO
z6|={Gb8UB7;T(OmU=n-W9foU=<psh^?)A=Z!-=nbiSL|=drtQg_x!Tw4MPM>O-p>O
z-OHoiJJiMRdqZ0>&Q(eHW23OI;8;gt;^D(G0Gd(BReK=5Q@qR92Ul#ycSY{*K=xCc
zfJ!WZ5JP~0BJ4Q;O)8&Zqr5E?^5Ok@R7{q}ql>3QJNJwGXr5MQXS0>!S(V{Kp;_`Q
zcP3jb<qB%OjCMi5+nFmDX4Sa49&?g^8p`-ET1`d?%_PEwUEx+Ztd|Bb>v&V$Gxmce
z5wPl_kxVoSL)hpZ?p{G?M!*LH$}`1hTKjx9q=-ClP}u>5WBhjO9)AmL#Z&P@y>Mn^
znYp2@D;(4(YI|gT=epgkACT4vBEz77e?6uc<#cXVeQ=K7XnQ%`gk<3b%d-lPB@((3
z>W?b!gfBhpa4Ig;{h^L#LrXo`Y!N3jd!8STv_rc}5lW|KfFC!peW)+q=o7fZ<TUrF
zk~)-uu{@SNIH4rRhek4NJ92j**D#fvDykKB5)O}z2F|Hw79R1UT;O-3qc%}%soq;3
z?~X;Nji+O64lztiXcXZbKN}0fV|q1~rOS|akUQE-`$cTaDD$Wam*80WuT&iaYN;{V
z%lvlxc1ZTu_Rr`NGlE*-+K0Hl=sRofA5z8#dyXV0<Cb~_(2Hj4Pxc?n4rRtu%4Bj_
z)I$6j>et&?R?lP^{DC%qT}+g$A0vXxhyMgX)`zB?8_~?OxoM`#xvKguk9S^e7Uhtc
zNJ^xKU1g#$2J9H?<9~GqmxQ4!ct$|!3eMM`Z<2LM)+g4R%=(@+0#F|t6oP@q%gXS-
zUGJ71cfAPDBfN#Mg76}Om`Bk7)LtcZOXyfLd3sB8`Gr|^KYJg}m|JC>-|X75>z>zt
nm$+(jiP8aSxuZtJrgl<irQ4Qw)(CuRAt&uw9{Yp9N7(!a@k-3T

diff --git a/units/rat.py b/units/rat.py
index 8729553..8eeff9e 100644
--- a/units/rat.py
+++ b/units/rat.py
@@ -7,7 +7,7 @@ AGE_THRESHOLD = 200
 SPEED_REDUCTION = 0.5
 PREGNANCY_DURATION = 500
 BABY_INTERVAL = 50
-OVERLAP_TOLERANCE = 20
+
 
 class Rat(Unit):
     def __init__(self, game, position=(0,0), id=None):
@@ -67,6 +67,7 @@ class Rat(Unit):
         self.direction = self.calculate_rat_direction()
         
     def collisions(self):
+        OVERLAP_TOLERANCE = self.game.cell_size // 4
         if self.age < AGE_THRESHOLD:
             return
         units = []