pylint fixes
This commit is contained in:
+13
-48
@@ -95,6 +95,7 @@ class GamePlay(BaseScreen):
|
|||||||
self.mpos = (0, 0)
|
self.mpos = (0, 0)
|
||||||
self.tile_pos = None
|
self.tile_pos = None
|
||||||
self.tile_pos_decimal = (0, 0)
|
self.tile_pos_decimal = (0, 0)
|
||||||
|
self.movement_keys = {pg.K_a: 0, pg.K_d: 1, pg.K_w: 2, pg.K_s: 3}
|
||||||
|
|
||||||
def process_event(self, event):
|
def process_event(self, event):
|
||||||
"""Handle mouse clicks, keyboard input, and UI button presses.
|
"""Handle mouse clicks, keyboard input, and UI button presses.
|
||||||
@@ -123,26 +124,26 @@ class GamePlay(BaseScreen):
|
|||||||
|
|
||||||
self.tile_pos = (int(self.tile_pos_decimal[0]), int(self.tile_pos_decimal[1]))
|
self.tile_pos = (int(self.tile_pos_decimal[0]), int(self.tile_pos_decimal[1]))
|
||||||
if event.type == pg.MOUSEBUTTONDOWN:
|
if event.type == pg.MOUSEBUTTONDOWN:
|
||||||
if event.button == 1:
|
if event.button == 1 and self.tile_pos is not None:
|
||||||
if self.tile_pos is not None:
|
|
||||||
if game_rect.collidepoint(self.mpos):
|
if game_rect.collidepoint(self.mpos):
|
||||||
# only clear and reselect when clicking inside the game surface
|
# only clear and reselect when clicking inside the game surface
|
||||||
self.clear_selection()
|
self.clear_selection()
|
||||||
self.selected = self.select_tower(self.tile_pos)
|
self.selected = self.select_tower(self.tile_pos)
|
||||||
if self.selected is not None:
|
if self.selected is not None:
|
||||||
self.selected.selected = True
|
self.selected.selected = True
|
||||||
if self.bought:
|
|
||||||
if self.game.tilemap.placeable(self.tile_pos):
|
if self.bought and self.game.tilemap.placeable(self.tile_pos):
|
||||||
if not any(tw.tile_pos == self.tile_pos for tw in self.tower_group):
|
if not any(tw.tile_pos == self.tile_pos for tw in self.tower_group):
|
||||||
tower = Tower(self.game, self.mpos, self.tile_pos, 'cannon')
|
tower = Tower(self.game, self.mpos, self.tile_pos, 'cannon')
|
||||||
self.tower_group.add(tower)
|
self.tower_group.add(tower)
|
||||||
self.bought = False
|
self.bought = False
|
||||||
if event.button == 3:
|
|
||||||
|
elif event.button == 3 and self.tile_pos is not None:
|
||||||
for tower in self.tower_group:
|
for tower in self.tower_group:
|
||||||
if tower.tile_pos == self.tile_pos:
|
if tower.tile_pos == self.tile_pos:
|
||||||
tower.kill()
|
tower.kill()
|
||||||
|
|
||||||
if event.type == pgi.UI_BUTTON_PRESSED:
|
elif event.type == pgi.UI_BUTTON_PRESSED:
|
||||||
if event.ui_element == self.buy_button:
|
if event.ui_element == self.buy_button:
|
||||||
self.bought = True
|
self.bought = True
|
||||||
# self.tower = Tower(self.game, self.mpos, self.tile_pos, 'cannon')
|
# self.tower = Tower(self.game, self.mpos, self.tile_pos, 'cannon')
|
||||||
@@ -152,29 +153,15 @@ class GamePlay(BaseScreen):
|
|||||||
if self.selected:
|
if self.selected:
|
||||||
self.selected.upgrade()
|
self.selected.upgrade()
|
||||||
|
|
||||||
if event.type == pg.KEYDOWN:
|
elif event.type == pg.KEYDOWN and event.key in self.movement_keys:
|
||||||
if event.key == pg.K_a:
|
self.movment[self.movement_keys[event.key]] = True
|
||||||
self.movment[0] = True
|
elif event.type == pg.KEYUP and event.key in self.movement_keys:
|
||||||
if event.key == pg.K_d:
|
self.movment[self.movement_keys[event.key]] = False
|
||||||
self.movment[1] = True
|
|
||||||
if event.key == pg.K_w:
|
|
||||||
self.movment[2] = True
|
|
||||||
if event.key == pg.K_s:
|
|
||||||
self.movment[3] = True
|
|
||||||
|
|
||||||
if event.key == pg.K_q:
|
elif event.type == pg.KEYDOWN and event.key == pg.K_q:
|
||||||
self.camera.zoom_offset(self.center, -0.25)
|
self.camera.zoom_offset(self.center, -0.25)
|
||||||
if event.key == pg.K_e:
|
elif event.type == pg.KEYDOWN and event.key == pg.K_e:
|
||||||
self.camera.zoom_offset(self.center, 0.25)
|
self.camera.zoom_offset(self.center, 0.25)
|
||||||
if event.type == pg.KEYUP:
|
|
||||||
if event.key == pg.K_a:
|
|
||||||
self.movment[0] = False
|
|
||||||
if event.key == pg.K_d:
|
|
||||||
self.movment[1] = False
|
|
||||||
if event.key == pg.K_w:
|
|
||||||
self.movment[2] = False
|
|
||||||
if event.key == pg.K_s:
|
|
||||||
self.movment[3] = False
|
|
||||||
|
|
||||||
def update(self, dt):
|
def update(self, dt):
|
||||||
"""Update enemies, towers, and camera position.
|
"""Update enemies, towers, and camera position.
|
||||||
@@ -239,25 +226,3 @@ class GamePlay(BaseScreen):
|
|||||||
"""Deselect all towers."""
|
"""Deselect all towers."""
|
||||||
for tower in self.tower_group:
|
for tower in self.tower_group:
|
||||||
tower.selected = False
|
tower.selected = False
|
||||||
|
|
||||||
#private helpers jsut within class (planned not sure yet)
|
|
||||||
def _remove_tower_at(self, tile_pos):
|
|
||||||
"""Remove the tower at tile_pos on right click, if one exists.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
tile_pos (tuple[int, int]): Grid position to remove from.
|
|
||||||
"""
|
|
||||||
|
|
||||||
def _handle_keydown(self, key):
|
|
||||||
"""Set movement flags and trigger zoom on key press.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
key (int): pygame key constant.
|
|
||||||
"""
|
|
||||||
|
|
||||||
def _handle_keyup(self, key):
|
|
||||||
"""Clear movement flags on key release.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
key (int): pygame key constant.
|
|
||||||
"""
|
|
||||||
|
|||||||
Reference in New Issue
Block a user