From d97daf6d55e230d136c33debc40d385366378cbe Mon Sep 17 00:00:00 2001
From: barmal4 <barmal4@st.amu.edu.pl>
Date: Tue, 30 Mar 2021 23:10:20 +0200
Subject: [PATCH] defuse mechanic added'

---
 Engine/Board.py                               |   7 +++++++
 Engine/Game.py                                |   7 ++++++-
 Engine/__pycache__/Agent.cpython-39.pyc       | Bin 761 -> 894 bytes
 Engine/__pycache__/Board.cpython-39.pyc       | Bin 1575 -> 1809 bytes
 Engine/__pycache__/Bomb.cpython-39.pyc        | Bin 518 -> 518 bytes
 Engine/__pycache__/BombFactory.cpython-39.pyc | Bin 816 -> 816 bytes
 Engine/__pycache__/Game.cpython-39.pyc        | Bin 2414 -> 2512 bytes
 Engine/__pycache__/Point.cpython-39.pyc       | Bin 1185 -> 1185 bytes
 Engine/__pycache__/Stone.cpython-39.pyc       | Bin 429 -> 429 bytes
 __pycache__/Constants.cpython-39.pyc          | Bin 545 -> 545 bytes
 10 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Engine/Board.py b/Engine/Board.py
index 23a03a79..d837a6b0 100644
--- a/Engine/Board.py
+++ b/Engine/Board.py
@@ -1,5 +1,6 @@
 import pygame
 from Constants import ROWS, COLS, SQUARE_SIZE, GREEN, BLACK, WIDTH
+from Engine.Bomb import Bomb
 
 
 class Board:
@@ -31,3 +32,9 @@ class Board:
                 rect = image.get_rect()
                 rect.center = (key.getX() * SQUARE_SIZE + SQUARE_SIZE / 2, key.getY() * SQUARE_SIZE + SQUARE_SIZE / 2)
                 self.win.blit(image, rect)
+
+    def getBomb(self, point):
+        if point in self.bombMap:
+            return self.bombMap[point]
+        return Bomb(0,0,"")
+
diff --git a/Engine/Game.py b/Engine/Game.py
index c13d1f91..c91e31c8 100644
--- a/Engine/Game.py
+++ b/Engine/Game.py
@@ -24,6 +24,7 @@ class Game:
         self.goingDown = True
 
     def update(self):
+        self.agent.defuse(self.board.getBomb(self.agent.getPoint()))
         self.board.drawSquares(self.win)
         self.board.drawBombs()
         self.board.drawAgent(self.win, self.agent)
@@ -46,11 +47,15 @@ class Game:
         self.agent.point = point
 
     def randomizeObject(self):
-        for x in range(10):
+        i = 0
+        while i < 11:
             point = Point(random.randint(0, 7), random.randint(0, 7))
+            if(point.getX() == 0 and point.getY() == 0):
+                continue;
             if point not in self.board.bombMap:
                 object = self.pickObject(random.randint(0, 4))
                 self.board.bombMap[point] = object
+                i += 1
 
     def pickObject(self, rand):
         if rand == 0:
diff --git a/Engine/__pycache__/Agent.cpython-39.pyc b/Engine/__pycache__/Agent.cpython-39.pyc
index c0aafecad3d16333bb8783b3203f95dbe355c8c7..2e269567b125829527b852c6dfd3535993543efd 100644
GIT binary patch
delta 263
zcmey#`j3q-k(ZZ?0SGQnNKVjYp2)XYO9jYFWr$)-VTfW%VN79aVTfW*VNPKI(kv;g
zDQrNRHHAHxL6c+R<vWaQlQ%GCF>+0oW|FE;W&)W61t2yEI|Fes$chxk8pe2r6b7J9
zCch9(##@}3#V)C7rNyZ!noLE!Koz%GlJawtiuiy`2*D2$WJ>`n0x2j4TfkVw<CvbB
ySE2`z@Y7_w#StH$mpIvuNmEAzt{K&sA`YMgE65BsAi=@N!NS2jxrZr-kr@EIt}<5u

delta 130
zcmeyz_LG$_k(ZZ?0SLZMicfgSG?8zyk_?cS$`Hkv!Vtxj!kEI;!Vtxr!koeaq*+o}
zgBdj0Cf>fo$TE2cW0o8TP;D_2NIzp0pJRGzUWs0MYDqwTW?qS(ChO#FO!|{Un1zLk
WK<b!5YFU5;2O|f|WI^T}Mn(V}QXIel

diff --git a/Engine/__pycache__/Board.cpython-39.pyc b/Engine/__pycache__/Board.cpython-39.pyc
index 8e4e7298e4e15cdf0ed3ab7b544850e6132dfab9..28b46e8cf5a0556b12379e38de93d28726e47708 100644
GIT binary patch
delta 882
zcmZ`%!EVz)5Z&3eoweg6REnCC29Z{9FeyDDP6&w-=!qhcTM*DR>qH4{4eOMO%25uj
z#1-Qoa88H|H^hMt;J}p&`3C->%(#V$3U;+`*E7#=XJ+TU8yAb6Lcw7;{CC~WPi9=K
z!Tq?=s4J$#w%oDXHn4T33}qfMWghajqoBn+D<0mI9?XojU}q~%t8gR!a@|$V5o_mE
z9tm#z^Qm-E_XE?#<PkgunS6vF%>tS<*=Irr`!mrEwsnzg8I;J8SGu#`db!upen|9?
z=nNciaXPSYoP6bPU@mzm*4NJD%ue6m9qD<bo)@%9@D91lB$uU&Li12Pws`VgG$wD+
z9<d>7vL{Dlpi=}F*_cOs2%$CNLy;N^@XM?)#Vc$IV}VvH%|&7)l~`aW*yB?^7LiEp
zDH|IRq|OvQW%3$}tb(d({%=c<N5-?9i&qxXVlpw7mKQ05IRvky^SHI`LD=+rd!es1
z#jk70XQMH>M90enb%G@VDwJME@JvmWnThBA>$b6lZ=`GF`)_sV8N(`4!V3sgYzHi=
z5J<QN2c@;3qtz<aF=KZ5glMOO<8I)(iz}=nL|F-6F<t&$$`%`eqR9^hc8A!|fV>&=
zc$TA<_=V>zX!Audz?VGN6}i4YqPwpkGqf1Rnnig~IEn4lz2V7Z)4ckC($GZG^n>;Y
zRtU~y|8$(T(P81rT0?Sa%AB;Mli9tzE+^m2m1aACZ?`|#^;ap1Ea1%lFTt6-wG*hl
QZT~i9iP179p$@M21zxkLo&W#<

delta 648
zcmZ{hK~K~`6vyYyOuMt)Z6$&!utXrnL$eq?aWIAeA#n3Tyl4~(vzV+v<8+Z|T0LlD
z;;os48%cX2d=)O7=@;PQ2jIwis}VIillf)d|GoLQd9Mgg+Cl959>ewQcw_TO7Qqxe
zF1p>ZHKv7@UznDk`E#XVokdRZZoackwZAWp!6Ke?t~h@nvCOjyUa1yJr_A_vA6`Ji
zp25Xp8zn<}ElhG)i|u6B_@oUHP@<(xe7OGhAU3^}%2S14;6WR=z2skE#3o{G;l|2|
zU-$M0<_?zqZPp~SB}(5WEBB|>JlHGI{qzmPjP=<Hd-*X3x@9oIaz21QFNKDT_hra5
z4_O7dK-DSTObi-YjI$ry;T6wCCQ4PYTxL)<E6j{hR(4p3ex>)PvcogE(ZX-FOYrTf
zoDC=Gzef;JU}y|xl+dx?WjCIp>s`V$VTM5MGqZ@uG1P=wyy?BK<yNw{Wjd7mZzGnm
zBn`17rA|{%J^R6#6i=guedyj_y+yAl2=@pP;buC&Mr3Fr4xZs?6jzRNl`~YMrWv)B
aJNIZ9{p)e9p6n(1V7Ipb<RB3WX2dlaZgg(|

diff --git a/Engine/__pycache__/Bomb.cpython-39.pyc b/Engine/__pycache__/Bomb.cpython-39.pyc
index 12cd0cf4593bd0cb163640521ed54052f39fde65..0d1307365785cf74de02e2c711652a28f5361fde 100644
GIT binary patch
delta 79
zcmZo;X=C9{<mKgJ0D{XCk`tax<h{yxYvN-SM)t`ZjEh7$f#OB%s07F4{fvqN7=j-d
F#Q@+H5ODwi

delta 79
zcmZo;X=C9{<mKgJ0D|3f;}afD<h{xmHSw_uBim#S#zmqWK=C3rRDyl-env$B48aeK
FVgSAz57qzx

diff --git a/Engine/__pycache__/BombFactory.cpython-39.pyc b/Engine/__pycache__/BombFactory.cpython-39.pyc
index bf63668f6f61aacbe8751ae67a6518d9d6d5705a..0a585e5627ce7c27473ec888964301026e97d29c 100644
GIT binary patch
delta 42
xcmdnMwt<Z|k(ZZ?0SGQnNKOdd$g9G{$UfPKshN>=@-`+5##@u$GdVCa0|4HA3fuqy

delta 42
wcmdnMwt<Z|k(ZZ?0SGL6;}iTg@~SW~vQ0K(YG!1ayp73%F>3OACI?0)0LS|Yu>b%7

diff --git a/Engine/__pycache__/Game.cpython-39.pyc b/Engine/__pycache__/Game.cpython-39.pyc
index 2c8596b32ea48a5f7c558ae1b3e40abd42ff22ef..148b03570b7e8f451f73100e9f413839acdade92 100644
GIT binary patch
delta 568
zcmYL_KX24P5XE=a>-ApjJ4Hu=!Vw__0>a^6I+{ozprAqs3Pc(R_=0j#a=JN#h~xvL
z^b~AM;ce*Q10eAY(jmE`4Fwf7;>{5eul$?0Gvo2T{nb4<(b;IXXB3_vAD%xw+4|i1
zqN(G*>8~{B-$hs6T9j_%9X|jnHBdEyx{jvW1QjR{Nk!K&X#ek$ppNoR^3oqPsj@Yg
zsZ*&H>Y?I!jLkDXi?D8s{^rYZpO<8lyy%y=hS|=u#zEa5Zta%-Pn7%1CeM0k7*9`4
zJ^#e~KE=z(@HwC{=zh#Ck+j$NQM^bi{(b!D*vV_u3Yt(wh2B<Nma3#$7gR(+AFF*m
z(G`3K^lodu2@SXZ^vF~ie&T_BMQkcnCr96zpaV^!N^S?$O0OyWCBCjEbZ2D5aBlB0
z;Q)uJAQ2dV&jY#RE<$5@W49RYtS1uTn=eYo1;D?tOL0S6yy8FE<$38=WXMsE7D!V@
zUCR7-`*Bvr9cn=Y@KwK`+>KWu*Ze_Jq?aVQAXxP`+~S!w<TwKyIg6FJS(ox068UMq
O=J(vsRA(4JUD03Ob$P1*

delta 491
zcmYLF%}N6?5Y8mo-KedURzduOYO$`O2Tv_}(}O2b1b+%*3tOrMTTK^H*rL!kFyKkC
z`w02~qHo}NJ$tAJPd<P%ZNV(_<(u!DO(ye^`biF#;_*R->+$Khc%q(%UpU0gJAZ|g
zxfM%060LQNMh+ohRn`VX9s=|-5wbp$q+?hi2j<&Vr>)5I*e=tf__I5p)3}+Obma_@
zqFfl9K+;eM%-qZ0)q<*&{q6c`&DXQ26(pvIdH`tz*WK(uQ*{Jak#$aWF4t2i=&X6O
z_HP`d-EQ}g_{@VAY_OxvCivj<w(z(oLjKQMyvYOVSyrt}&?;bUyYI>n-`Es^=(z!3
zV;73v;#ylB8kh!z4qe!x8M#hm>G4vnQr1aKBU_hhUj3}#(2jkY$WA+Y4lSL%b27b|
zLkz|-k|yswBr<dqClFM%Xuh0HYZ+<YtSE12p2RVNWfQ8&=@`-mfdXYKg^^H7kD%aA
P=q2;1zK8JW{wMwbzu9Lo

diff --git a/Engine/__pycache__/Point.cpython-39.pyc b/Engine/__pycache__/Point.cpython-39.pyc
index f9f42ce25ffa14f210c03e48d772c3426a9807a1..4fbbc3707872fc60b97117400473aa1bdfe5fab4 100644
GIT binary patch
delta 22
ccmZ3;xsa1Lk(ZZ?0SGQnNKVk($UB7v06RYgkpKVy

delta 22
ccmZ3;xsa1Lk(ZZ?0SNBTiBB-t$UB7v06X~wrvLx|

diff --git a/Engine/__pycache__/Stone.cpython-39.pyc b/Engine/__pycache__/Stone.cpython-39.pyc
index fa76839bea1d56030750a228cf7b5cb53c5e09e3..1a7586bb3cc06c16bb936d444301621ca52c2713 100644
GIT binary patch
delta 22
ccmZ3>yq1|ak(ZZ?0SGQnNKP=_$h&|M06c#MtpET3

delta 22
ccmZ3>yq1|ak(ZZ?0SL0^$0rzX<XylB068fIP5=M^

diff --git a/__pycache__/Constants.cpython-39.pyc b/__pycache__/Constants.cpython-39.pyc
index 941bb29ff2b60f7a66ef26ff30220d873761369d..467665c4206ea82f4195f78506c61f6075a3d002 100644
GIT binary patch
delta 50
ocmZ3;vXF&0k(ZZ?0SGQnNKSCs$orE~nu&uE2$@(I;SkOS0PA@MYXATM

delta 50
mcmZ3;vXF&0k(ZZ?0SJ29;}fhm^8RF$X5;`tCKg6GgtGzOA_ffr