xevion/game-jam-2020
1
0
Fork 0
mirror of https://github.com/n0remac/game-jam-2020.git synced 2025-12-10 14:05:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

removed whitespace and other formatting.

Browse Source
This commit is contained in:
Cameron Smart
2020-04-20 13:45:49 -07:00
parent c051414870
commit dff882770d
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
triple-dungeon/config.py
View File

@@ -43,7 +43,6 @@ class Config(object):
TOP_VIEWPORT_MARGIN = 100 TOP_VIEWPORT_MARGIN = 100
class Enums(Enum): class Enums(Enum):
""" """
A simple class used for tracking different simple A simple class used for tracking different simple

18
triple-dungeon/main.py
View File

@@ -11,9 +11,10 @@ import math
from config import Config from config import Config
from map import Dungeon from map import Dungeon
from mobs import Player, Enemy from mobs import Player, Enemy
from config import Config, Sprites from config import Config
from projectiles import Temp from projectiles import Temp
class Game(arcade.Window): class Game(arcade.Window):
""" """
Main application class. Main application class.
@@ -79,11 +80,10 @@ class Game(arcade.Window):
self.dungeon.render() self.dungeon.render()
self.player.draw() self.player.draw()
self.enemy_list.draw() self.enemy_list.draw()
self.wall_list.draw()
self.bullet_list.draw() self.bullet_list.draw()
x, y = self.player.center_x, self.player.center_y + 100 x, y = self.player.center_x, self.player.center_y + 100
arcade.draw_text(f"({x}, {y})", x, y, arcade.color.WHITE, 15) # arcade.draw_text(f"({x}, {y})", x, y, arcade.color.WHITE, 15)
def on_key_press(self, key, modifiers): def on_key_press(self, key, modifiers):
"""Called whenever a key is pressed. """ """Called whenever a key is pressed. """
@@ -128,8 +128,8 @@ class Game(arcade.Window):
# Create a bullet TEMP SPRITE, currently wielding frog slingshot # Create a bullet TEMP SPRITE, currently wielding frog slingshot
bullet = Temp() bullet = Temp()
# Position the bullet at the player's current location # Position the bullet at the player's current location
start_x = self.player_list.center_x start_x = self.player.center_x
start_y = self.player_list.center_y start_y = self.player.center_y
bullet.center_x = start_x bullet.center_x = start_x
bullet.center_y = start_y bullet.center_y = start_y
@@ -198,21 +198,21 @@ class Game(arcade.Window):
self.view_bottom, self.view_bottom,
Config.SCREEN_HEIGHT + self.view_bottom) Config.SCREEN_HEIGHT + self.view_bottom)
#Projectile updates # Projectile updates
self.bullet_list.update() self.bullet_list.update()
for bullet in self.bullet_list: for bullet in self.bullet_list:
# Collision Checks # Collision Checks
hit_list = arcade.check_for_collision_with_list(bullet, self.wall_list) hit_list = arcade.check_for_collision_with_list(bullet, self.dungeon.getWalls())
# If it did, get rid of the bullet # If it did, get rid of the bullet
if len(hit_list) > 0: if len(hit_list) > 0:
bullet.remove_from_sprite_lists() bullet.remove_from_sprite_lists()
# If the bullet flies off-screen, remove it. TEMP change to range calc # If the bullet flies off-screen, remove it. TEMP change to range calc
if bullet.bottom < self.view_bottom or bullet.top > self.view_bottom+Config.SCREEN_HEIGHT or bullet.right > self.view_left+Config.SCREEN_WIDTH or bullet.left < self.view_left: if (bullet.bottom < self.view_bottom or bullet.top > self.view_bottom+Config.SCREEN_HEIGHT
or bullet.right > self.view_left+Config.SCREEN_WIDTH or bullet.left < self.view_left):
bullet.remove_from_sprite_lists() bullet.remove_from_sprite_lists()
def main() -> None: def main() -> None:
""" """
Setups up window classes and runs the game. Setups up window classes and runs the game.

12
triple-dungeon/projectiles.py
View File

@@ -5,8 +5,6 @@ Organizes classes related to projectiles
import arcade import arcade
from config import Config, Sprites
class Projectile(arcade.Sprite): class Projectile(arcade.Sprite):
""" """
@@ -17,9 +15,9 @@ class Projectile(arcade.Sprite):
super().__init__() super().__init__()
self.speed = speed self.speed = speed
self.damage = damage #unimplemented self.damage = damage # unimplemented
self.texture = None self.texture = None
self.range = range #unimplemented self.range = range # unimplemented
self.collision_list = [] self.collision_list = []
@@ -31,7 +29,7 @@ class Temp(Projectile):
super(Temp, self).__init__(*args, **kwargs) super(Temp, self).__init__(*args, **kwargs)
self.texture = arcade.load_texture("resources/images/monsters/frog/frog1.png") self.texture = arcade.load_texture("resources/images/monsters/frog/frog1.png")
self.speed = 12 self.speed = 12
self.scale = 2 self.scale = 4
#collision list for who/what to collide with: wall, player, enemy # collision list for who/what to collide with: wall, player, enemy
#Can place function for starting on player or enemy # Can place function for starting on player or enemy