From db21bf5e04e362137c0420a21acffff82a5b6081 Mon Sep 17 00:00:00 2001
From: Faraphel <rc60650@hotmail.com>
Date: Thu, 23 Feb 2023 17:34:43 +0100
Subject: [PATCH] it is now possible to see the opponent move on our board

---
 NOTE.md                                |   1 -
 assets/image/grid/boat/broken.png      | Bin 892 -> 0 bytes
 source/gui/scene/Game.py               |   2 ++
 source/gui/texture/Grid.py             |   1 -
 source/gui/widget/grid/GameGridAlly.py |  12 ++++++++++++
 source/network/game_network.py         |   2 ++
 6 files changed, 16 insertions(+), 2 deletions(-)
 delete mode 100644 assets/image/grid/boat/broken.png

diff --git a/NOTE.md b/NOTE.md
index bf62086..cdde04a 100644
--- a/NOTE.md
+++ b/NOTE.md
@@ -10,7 +10,6 @@ A faire :
 
 - Ecran de victoire
 - Affichage des coups de l'opposant
-- Faire marcher le score
 - Faire marcher le tchat
 - Sauvegarde / Quitter
 
diff --git a/assets/image/grid/boat/broken.png b/assets/image/grid/boat/broken.png
deleted file mode 100644
index 41fcb174b447517220a74f1c219a593d290ed9c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 892
zcmV-?1B3jDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0})9?K~z{r?Uvt5
zlTjGQAGaA|!yhAIMvB;wfg$rkyl_Mp!P<zt=_06DY5zd?2?Ob_D3GqYu;{`I0|PG%
zhOE&=Lg0dugf2=7(hHr+Kv~n%_xtYMIIVZT`~{I8`0zgO*}I*y^PcmZM~?aLv76Uo
zT!v5JNw^F*;gQh+lTc~CgZH2p9x4v_9;(jHPSw@br5p~2J`nl^j>0o=&lGzFoc1d&
zmrKIou=Mu!N`HU9w6?Yi1|l098<NRnTzKX@{0Kk5JyBy`b*{mQ+S*z*G&EGhP7B%D
z*^$Y~Nm*Q6<n3+vjKN;8nb#cW;8O;nP{^`#Vz=9+uCC6!+aLM>_=^+J>GS!FX+H||
z0W?83gXZRDUP`jQzHUbH&AeK{#e55XhFr9a*_KBi0QdP#2Jv`YmX?+n?gwsFc06vz
z9y4Z}4;mD%f!FZC?(VKkO-;$x)>gLF0zOlQtI*?gIwcSY$l&0hG&OOOje%TeK&-Z5
z42HJ1w@)XNN$KwH&b9*1%KZGiOixeC@-ipP;5oE<4R@h87z|2ZU!Sps8yg#CVPS!v
zr6Ip(xeW<NnSf5e-!JKO+SqcNn}1~DAMh2t5A&nZ_zB&^!^6_n)@C%UuCB`1*cihU
z<U-5vrWnizh1u^rd<6Zl98sv++uPO1$cTzWBFf|O<bH=)wxWH^Me`L_+NsVd$nWZZ
zfO2N`mA<QitNj<ub<X$#JSI=ET~G?v2^Zm6$lbyu!}t9VK87V%_CdhysV^#Brdw7~
z6;tgDFqe-vG&D$0Pmi>;v<Pd4R4OIWXjInL*0N7!Giop!mZq8kaNjbIcQCCMo|dc;
z=H})k7K^c1VH2|tlT}Fy&w^4gF?Fya@_PR+30Wfy3=D|dZ5*hiqPnq~0lb8t`0r+B
zX0k07@RgWwv6iJ=S+2ta<Sh)ZtgM{iX~?RmzP?^;Hk)yB&d$zCB9RcKxE_tg`i8+l
za|7mAJ~~&Jc7<a%*T!te)NP!-hs7QE0<t33Q!QtRb>)%5-NBrH$+-Ks5cv&N!|Qzd
S3Q>{(0000<MNUMnLSTZPQ?LF2

diff --git a/source/gui/scene/Game.py b/source/gui/scene/Game.py
index 4aeb205..bc75f36 100644
--- a/source/gui/scene/Game.py
+++ b/source/gui/scene/Game.py
@@ -46,12 +46,14 @@ class Game(Scene):
 
             grid_style=texture.Grid.Style1,
             boat_style=texture.Grid.Boat.Style1,
+            bomb_style=texture.Grid.Bomb.Style1,
             rows=8, columns=8,
 
             background_batch=self.batch_grid_background,
             line_batch=self.batch_grid_line,
             cursor_batch=self.batch_grid_cursor,
             boat_batch=self.batch_grid_boat,
+            bomb_batch=self.batch_grid_bomb
         )
 
         def board_ally_ready():
diff --git a/source/gui/texture/Grid.py b/source/gui/texture/Grid.py
index 7ea380e..b064e10 100644
--- a/source/gui/texture/Grid.py
+++ b/source/gui/texture/Grid.py
@@ -14,7 +14,6 @@ class Grid:
         class Style1(Style):
             body = path_boat / "body.png"
             edge = path_boat / "edge.png"
-            broken = path_boat / "broken.png"
             solo = path_boat / "solo.png"
 
     class Bomb:
diff --git a/source/gui/widget/grid/GameGridAlly.py b/source/gui/widget/grid/GameGridAlly.py
index 03c8629..7b5fb3f 100644
--- a/source/gui/widget/grid/GameGridAlly.py
+++ b/source/gui/widget/grid/GameGridAlly.py
@@ -29,6 +29,7 @@ class GameGridAlly(GameGrid):
 
                  grid_style: Type[Style],
                  boat_style: Type[Style],
+                 bomb_style: Type[Style],
 
                  boats_length: list[int],
                  preview_color: ColorRGB = (150, 255, 150),
@@ -45,7 +46,9 @@ class GameGridAlly(GameGrid):
         self.orientation: Orientation = Orientation.HORIZONTAL
 
         self._boat_kwargs = dict_filter_prefix("boat_", kwargs)
+        self._bomb_kwargs = dict_filter_prefix("bomb_", kwargs)
         self.boat_style = boat_style
+        self.bomb_style = bomb_style
 
         self.add_listener("on_click_release", self.on_click_release)
         self.add_listener("on_hover", lambda rel_x, rel_y: self.preview_boat(self.get_cell_from_rel(rel_x, rel_y)))
@@ -147,6 +150,15 @@ class GameGridAlly(GameGrid):
         except InvalidBoatPosition: self.display_board(self.board)  # if the boat can't be placed, ignore
         else: self.display_board(preview_board, preview=True)
 
+    def place_bomb(self, cell: Point2D, touched: bool):
+
+        self.cell_sprites[cell] = Sprite(
+            img=self.bomb_style.get("touched" if touched else "missed"),
+            **self._bomb_kwargs
+        )
+
+        self._refresh_size()
+
     def on_click_release(self, rel_x: int, rel_y: int, button: int, modifiers: int):
         cell = self.get_cell_from_rel(rel_x, rel_y)
 
diff --git a/source/network/game_network.py b/source/network/game_network.py
index 79dbbd6..8035efb 100644
--- a/source/network/game_network.py
+++ b/source/network/game_network.py
@@ -48,6 +48,8 @@ def game_network(thread: "StoppableThread", window: "Window", connection: socket
 
                 touched = bomb_state in [BombState.TOUCHED, BombState.SUNKEN, BombState.WON]
 
+                in_pyglet_context(game_scene.grid_ally.place_bomb, data.position, touched)
+
                 if touched:
                     in_pyglet_context(game_scene.boat_broken_enemy)