Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create workflow for automatic pep8 enforcement #82

Merged
merged 4 commits into from
Jul 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/workflows/python-autopep8-enforcement.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: autopep8
on: pull_request
jobs:
autopep8:
# Check if the PR is not from a fork
if: github.event.pull_request.head.repo.full_name == github.repository
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
token: ${{ secrets.GITHUB_TOKEN }}
ref: ${{ github.head_ref }}
- name: autopep8
id: autopep8
uses: peter-evans/autopep8@v1
with:
args: --exit-code --recursive --in-place --aggressive --aggressive .
- name: Commit autopep8 changes
if: steps.autopep8.outputs.exit-code == 2
run: |
git config --global user.name 'Github Actions'
git config --global user.email '[email protected]'
git commit -am "Automated autopep8 fixes"
git push
16 changes: 10 additions & 6 deletions game/common/door.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,23 @@


class Door(MapObject):
def __init__(self, hitbox, health = GameStats.default_wall_health, open_speed = GameStats.door_opening_speed):
super().__init__(health,hitbox, collidable = True )
def __init__(
self,
hitbox,
health=GameStats.default_wall_health,
open_speed=GameStats.door_opening_speed):
super().__init__(health, hitbox, collidable=True)
self.opening_speed = open_speed
self.open_state = False
self.open_state = False
self.object_type = ObjectType.door

def to_json(self):
data = super().to_json()
data['opening_speed'] = self.opening_speed
data['open_state'] = self.open_state
return data

def from_json(self, data):
super().from_json(data)
self.opening_speed = data['opening_speed']
self.open_state = data['open_state']
self.open_state = data['open_state']
16 changes: 8 additions & 8 deletions game/common/enums.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@ class ObjectType:
door = 13
upgrade = 14
consumable = 15


class Upgrades:
none = 0
gun_upgrades = 1
movement_upgrades = 2
sight_upgrades = 3


class DamagingType:
none = 0
#note that bullet object has not been added yet
# note that bullet object has not been added yet
bullet = 1
grenade = 2
grenade = 2


class GunType:
Expand All @@ -45,14 +45,14 @@ class GunType:
shotgun = 3
sniper = 4


class GunLevel:
level_zero = 0
level_one = 1
level_two = 2
level_three = 3


class ShotPattern:
none = 0
single = 1
Expand All @@ -64,4 +64,4 @@ class Consumables:
none = 0
speed_boost = 1
health_pack = 2
armor_pack = 3
armor_pack = 3
17 changes: 10 additions & 7 deletions game/common/game_board.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@


class GameBoard(GameObject):
# the width and height parameters have default values to allow them to be set for unit testing purposes
def __init__(self, width=GameStats.game_board_width, height=GameStats.game_board_height):
# the width and height parameters have default values to allow them to be
# set for unit testing purposes
def __init__(self, width=GameStats.game_board_width,
height=GameStats.game_board_height):
super().__init__()
self.object_type = ObjectType.game_board

# pull width and height values from GameStats
self.width = width
self.height = height
Expand All @@ -22,7 +24,8 @@ def __init__(self, width=GameStats.game_board_width, height=GameStats.game_board
self.lethal_list = []

# this calculates starting radius to totally encompass the map at start
self.circle_radius = math.sqrt( ( self.width / 2 ) ** 2 + ( self.height / 2 ) ** 2 )
self.circle_radius = math.sqrt(
(self.width / 2) ** 2 + (self.height / 2) ** 2)

# set turn counter to 0, not sure the use for this yet
self.turn = 0
Expand Down Expand Up @@ -53,7 +56,7 @@ def to_json(self):
def from_json(self, data):
super().from_json(data)

self.width = data['width']
self.width = data['width']
self.height = data['height']

self.player_list = data['player_list']
Expand All @@ -63,5 +66,5 @@ def from_json(self, data):
self.lethal_list = data['lethal_list']

self.circle_radius = data['circle_radius']
self.turn = data['turn']

self.turn = data['turn']
28 changes: 18 additions & 10 deletions game/common/hitbox.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,42 +38,50 @@ def bottomLeft(self):

@property
def bottomRight(self):
return (self.position[0] + self.width, self.position[1] +self.height)
return (self.position[0] + self.width, self.position[1] + self.height)

@property
def middle(self):
return (self.position[0] + self.width / 2, self.position[1] +self.height / 2)

return (
self.position[0] +
self.width /
2,
self.position[1] +
self.height /
2)

# set height between 0 and max
@height.setter
def height(self, val):
if val > 0:
self.__height = val
else:
raise ValueError("Tried to set an invalid height for hitbox")

# Set width for hitbox between 0 and max
@width.setter
def width(self, val):
if val > 0:
self.__width = val
else:
else:
raise ValueError("Tried to set an invalid width for hitbox")

# set x between 0 and max game board width
@position.setter
def position(self, val):
if (0 <= val[0] <= GameStats.game_board_width) and (0 <= val[1] <= GameStats.game_board_height):
if (0 <= val[0] <= GameStats.game_board_width) and (
0 <= val[1] <= GameStats.game_board_height):
self.__position = val
else:
raise ValueError("Tried to set an invalid xy position tuple for hitbox")

raise ValueError(
"Tried to set an invalid xy position tuple for hitbox")

def to_json(self):
data = super().to_json()
data['width'] = self.width
data['height'] = self.height
data['position'] = self.position

return data

def from_json(self, data):
Expand All @@ -83,7 +91,7 @@ def from_json(self, data):
self.position = data['position']

def __str__(self):
return f"""
return f"""
Height: {self.height}
Width: {self.width}
X: {self.position}
Expand Down
15 changes: 11 additions & 4 deletions game/common/items/consumable.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,28 @@


class Consumable(Item):
def __init__(self, hitbox, health, count, speed_enum = None, health_enum = None, armor_enum = None):
def __init__(
self,
hitbox,
health,
count,
speed_enum=None,
health_enum=None,
armor_enum=None):
super().__init__(hitbox, health, count)
self.object_type = ObjectType.consumable
self.speed_enum = speed_enum
self.health_enum = health_enum
self.armor_enum = armor_enum

def to_json(self):
data = super().to_json()
data['speed_enum'] = self.speed_enum
data['health_enum'] = self.health_enum
data['armor_enum'] = self.armor_enum

def from_json(self, data):
super().from_json(data)
self.speed_enum = data['speed_enum']
self.health_enum = data['health_enum']
self.armor_enum = data['armor_enum']
self.armor_enum = data['armor_enum']
28 changes: 15 additions & 13 deletions game/common/items/gun.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,27 @@ def __init__(self, gun_type, level, coordinates=None, hitbox=None):
# Leveling subject to change
self.level = level
self.pattern = stats.GameStats.gun_stats[gun_type]['pattern']
self.damage = (round(stats.GameStats.gun_stats[gun_type]['damage']
* (stats.GameStats.gun_stats[gun_type]['level_mod'] ** self.level), 1)
if self.level > GunLevel.level_zero else 0)
self.damage = (
round(
stats.GameStats.gun_stats[gun_type]['damage'] * (
stats.GameStats.gun_stats[gun_type]['level_mod'] ** self.level),
1) if self.level > GunLevel.level_zero else 0)
self.fire_rate = (round(stats.GameStats.gun_stats[gun_type]['fire_rate']
* (stats.GameStats.gun_stats[gun_type]['level_mod'] ** self.level))
if self.level > GunLevel.level_zero else 0)
* (stats.GameStats.gun_stats[gun_type]['level_mod'] ** self.level))
if self.level > GunLevel.level_zero else 0)
self.range = (round(stats.GameStats.gun_stats[gun_type]['range']
* (stats.GameStats.gun_stats[gun_type]['level_mod'] ** self.level))
if self.level > GunLevel.level_zero else 0)
* (stats.GameStats.gun_stats[gun_type]['level_mod'] ** self.level))
if self.level > GunLevel.level_zero else 0)
self.mag_size = (round(stats.GameStats.gun_stats[gun_type]['mag_size']
* (stats.GameStats.gun_stats[gun_type]['level_mod'] ** self.level))
if self.level > GunLevel.level_zero else 0)
* (stats.GameStats.gun_stats[gun_type]['level_mod'] ** self.level))
if self.level > GunLevel.level_zero else 0)
self.reload_speed = (round(stats.GameStats.gun_stats[gun_type]['reload_speed']
* (stats.GameStats.gun_stats[gun_type]['level_mod'] ** self.level))
if self.level > GunLevel.level_zero else 0)
* (stats.GameStats.gun_stats[gun_type]['level_mod'] ** self.level))
if self.level > GunLevel.level_zero else 0)
if self.level > GunLevel.level_zero:
self.cooldown = stats.GameStats.gun_stats[gun_type]['cooldown']
self.cooldown['max'] = round(self.cooldown['max']
* (stats.GameStats.gun_stats[gun_type]['level_mod'] ** self.level))
self.cooldown['max'] = round(
self.cooldown['max'] * (stats.GameStats.gun_stats[gun_type]['level_mod'] ** self.level))
else:
self.cooldown = {'max': 0, 'rate': 0}

Expand Down
5 changes: 3 additions & 2 deletions game/common/items/item.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
from game.common.map_object import MapObject
from game.common.enums import ObjectType


class Item(MapObject):
def __init__(self, hitbox, health=None, count = 1):
def __init__(self, hitbox, health=None, count=1):
super().__init__(health, hitbox, True)
self.object_type = ObjectType.item
self.count = count

def to_json(self):
data = super().to_json()
data['count'] = self.count
Expand Down
15 changes: 11 additions & 4 deletions game/common/items/upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,28 @@


class Upgrade(Item):

def __init__ (self, hitbox, health, count, upgrade_enum = None, movement_enum = None, sight_enum = None ):

def __init__(
self,
hitbox,
health,
count,
upgrade_enum=None,
movement_enum=None,
sight_enum=None):
super().__init__(hitbox, health, count)
self.object_type = ObjectType.upgrade
self.upgrade_enum = upgrade_enum
self.movement_enum = movement_enum
self.sight_enum = sight_enum

def to_json(self):
data = super().to_json()
data['upgrade_enum'] = self.upgrade_enum
data['movement_enum'] = self.movement_enum
data['sight_enum'] = self.sight_enum
return data

def from_json(self, data):
super().from_json(data)
self.upgrade_enum = data['upgrade_enum']
Expand Down
4 changes: 2 additions & 2 deletions game/common/map_object.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def __init__(self, health=None, hitbox=None, collidable=None):
self.health = health
self.hitbox = hitbox
self.collidable = collidable

def to_json(self):
data = super().to_json()
data['health'] = self.health
Expand All @@ -27,7 +27,7 @@ def from_json(self, data):
self.collidable = data['collidable']

def __str__(self):
return f"""
return f"""
Health: {self.health}
Coordinates: {self.coordinates}
Hitbox: {self.hitbox}
Expand Down
Loading