Browse Source

code clean

Bastien Sevajol 7 years ago
parent
commit
5450289343
1 changed files with 20 additions and 20 deletions
  1. 20 20
      opencombat/gui/base.py

+ 20 - 20
opencombat/gui/base.py View File

280
         event: typing.Union[NoLongerVisibleOpponent, NewVisibleOpponent],
280
         event: typing.Union[NoLongerVisibleOpponent, NewVisibleOpponent],
281
         line_color,
281
         line_color,
282
     ) -> None:
282
     ) -> None:
283
-        if self.layer_manager.debug:
284
-            observer_actor = self.layer_manager.subject_layer.subjects_index[event.observer_subject_id]
285
-            observed_actor = self.layer_manager.subject_layer.subjects_index[event.observed_subject_id]
283
+        if not self.layer_manager.debug:
284
+            return
286
 
285
 
287
-            observer_pixel_position = self.layer_manager.scrolling_manager.world_to_screen(
288
-                *self.layer_manager.grid_manager.get_world_position_of_grid_position(
289
-                    observer_actor.subject.position,
290
-                )
286
+        observer_actor = self.layer_manager.subject_layer.subjects_index[event.observer_subject_id]
287
+        observed_actor = self.layer_manager.subject_layer.subjects_index[event.observed_subject_id]
288
+
289
+        observer_pixel_position = self.layer_manager.scrolling_manager.world_to_screen(
290
+            *self.layer_manager.grid_manager.get_world_position_of_grid_position(
291
+                observer_actor.subject.position,
291
             )
292
             )
292
-            observed_pixel_position = self.layer_manager.scrolling_manager.world_to_screen(
293
-                *self.layer_manager.grid_manager.get_world_position_of_grid_position(
294
-                    observed_actor.subject.position,
295
-                )
293
+        )
294
+        observed_pixel_position = self.layer_manager.scrolling_manager.world_to_screen(
295
+            *self.layer_manager.grid_manager.get_world_position_of_grid_position(
296
+                observed_actor.subject.position,
296
             )
297
             )
298
+        )
297
 
299
 
298
-            def draw_visible_opponent():
299
-                draw_line(
300
-                    observer_pixel_position,
301
-                    observed_pixel_position,
302
-                    line_color,
303
-                )
300
+        def draw_visible_opponent():
301
+            draw_line(
302
+                observer_pixel_position,
303
+                observed_pixel_position,
304
+                line_color,
305
+            )
304
 
306
 
305
-            # TODO: Not in edit layer !
306
-            self.layer_manager.edit_layer.append_callback(draw_visible_opponent, 1.0)
307
+        self.layer_manager.edit_layer.append_callback(draw_visible_opponent, 1.0)
307
 
308
 
308
     def fire_happen(self, event: FireEvent) -> None:
309
     def fire_happen(self, event: FireEvent) -> None:
309
-        # TODO: Not in edit layer !
310
         shooter_actor = self.layer_manager.subject_layer.subjects_index[event.shooter_subject_id]
310
         shooter_actor = self.layer_manager.subject_layer.subjects_index[event.shooter_subject_id]
311
         shooter_pixel_position = self.layer_manager.scrolling_manager.world_to_screen(
311
         shooter_pixel_position = self.layer_manager.scrolling_manager.world_to_screen(
312
             *self.layer_manager.grid_manager.get_world_position_of_grid_position(
312
             *self.layer_manager.grid_manager.get_world_position_of_grid_position(