diff --git a/object_handler.py b/object_handler.py index e53d185..c73df0c 100644 --- a/object_handler.py +++ b/object_handler.py @@ -16,19 +16,19 @@ class ObjectHandler: # Sprite Map #add_sprite(SpriteObject(game)) #add_sprite(AnimatedSprite(game)) - add_sprite(AnimatedSprite(game, path=self.animated_sprite_path + 'red_light/0.png', pos=(14.5, 5.5))) - add_sprite(AnimatedSprite(game, path=self.animated_sprite_path + 'red_light/0.png', pos=(14.5, 7.5))) - add_sprite(AnimatedSprite(game, path=self.animated_sprite_path + 'red_light/0.png', pos=(12.5, 7.5))) - add_sprite(AnimatedSprite(game, path=self.animated_sprite_path + 'red_light/0.png', pos=(9.5, 7.5))) - add_sprite(AnimatedSprite(game, path=self.animated_sprite_path + 'red_light/0.png', pos=(14.5, 12.5))) - add_sprite(AnimatedSprite(game, path=self.animated_sprite_path + 'red_light/0.png', pos=(9.5, 20.5))) - add_sprite(AnimatedSprite(game, path=self.animated_sprite_path + 'red_light/0.png', pos=(10.5, 20.5))) - add_sprite(AnimatedSprite(game, path=self.animated_sprite_path + 'red_light/0.png', pos=(3.5, 14.5))) - add_sprite(AnimatedSprite(game, path=self.animated_sprite_path + 'red_light/0.png', pos=(3.5, 18.5))) + #add_sprite(AnimatedSprite(game, path=self.animated_sprite_path + 'red_light/0.png', pos=(14.5, 5.5))) + #add_sprite(AnimatedSprite(game, path=self.animated_sprite_path + 'red_light/0.png', pos=(14.5, 7.5))) + #add_sprite(AnimatedSprite(game, path=self.animated_sprite_path + 'red_light/0.png', pos=(12.5, 7.5))) + #add_sprite(AnimatedSprite(game, path=self.animated_sprite_path + 'red_light/0.png', pos=(9.5, 7.5))) + #add_sprite(AnimatedSprite(game, path=self.animated_sprite_path + 'red_light/0.png', pos=(14.5, 12.5))) + #add_sprite(AnimatedSprite(game, path=self.animated_sprite_path + 'red_light/0.png', pos=(9.5, 20.5))) + #add_sprite(AnimatedSprite(game, path=self.animated_sprite_path + 'red_light/0.png', pos=(10.5, 20.5))) + #add_sprite(AnimatedSprite(game, path=self.animated_sprite_path + 'red_light/0.png', pos=(3.5, 14.5))) + #add_sprite(AnimatedSprite(game, path=self.animated_sprite_path + 'red_light/0.png', pos=(3.5, 18.5))) # NPC Map #add_npc(NPC(game)) - add_npc(NPC(game, path=self.npc_sprite_path + 'baller/0.png', pos=(5, 18), scale=0.6, shift=0.38)) + add_npc(NPC(game, path=self.npc_sprite_path + 'peter-griffin/0.png', pos=(5, 18), scale=0.6, shift=0.38)) def update(self): diff --git a/object_renderer.py b/object_renderer.py index d4856fd..85fe337 100644 --- a/object_renderer.py +++ b/object_renderer.py @@ -32,9 +32,9 @@ class ObjectRenderer: def load_wall_textures(self): return { - 1: self.get_texture('resources/textures/1.png'), - 2: self.get_texture('resources/textures/2.png'), - 3: self.get_texture('resources/textures/3.png'), - 4: self.get_texture('resources/textures/4.png'), - 5: self.get_texture('resources/textures/5.png'), + 1: self.get_texture('resources/textures/bg.jpg'), + 2: self.get_texture('resources/textures/bg.jpg'), + 3: self.get_texture('resources/textures/bg.jpg'), + 4: self.get_texture('resources/textures/bg.jpg'), + 5: self.get_texture('resources/textures/bg.jpg'), } \ No newline at end of file diff --git a/resources/sprites/npc/peter-griffin/0.png b/resources/sprites/npc/peter-griffin/0.png new file mode 100644 index 0000000..dc4f4c0 Binary files /dev/null and b/resources/sprites/npc/peter-griffin/0.png differ diff --git a/resources/sprites/npc/peter-griffin/attack/0.png b/resources/sprites/npc/peter-griffin/attack/0.png new file mode 100644 index 0000000..dc4f4c0 Binary files /dev/null and b/resources/sprites/npc/peter-griffin/attack/0.png differ diff --git a/resources/sprites/npc/tmp/0.png b/resources/sprites/npc/peter-griffin/death/0.png similarity index 100% rename from resources/sprites/npc/tmp/0.png rename to resources/sprites/npc/peter-griffin/death/0.png diff --git a/resources/sprites/npc/peter-griffin/idle/0.png b/resources/sprites/npc/peter-griffin/idle/0.png new file mode 100644 index 0000000..dc4f4c0 Binary files /dev/null and b/resources/sprites/npc/peter-griffin/idle/0.png differ diff --git a/resources/sprites/npc/tmp/attack/0.png b/resources/sprites/npc/peter-griffin/pain/0.png similarity index 100% rename from resources/sprites/npc/tmp/attack/0.png rename to resources/sprites/npc/peter-griffin/pain/0.png diff --git a/resources/sprites/npc/peter-griffin/walk/0.png b/resources/sprites/npc/peter-griffin/walk/0.png new file mode 100644 index 0000000..4eb9b32 Binary files /dev/null and b/resources/sprites/npc/peter-griffin/walk/0.png differ diff --git a/resources/sprites/npc/tmp/death/0.png b/resources/sprites/npc/tmp/death/0.png deleted file mode 100644 index 80694a3..0000000 Binary files a/resources/sprites/npc/tmp/death/0.png and /dev/null differ diff --git a/resources/sprites/npc/tmp/idle/0.png b/resources/sprites/npc/tmp/idle/0.png deleted file mode 100644 index 80694a3..0000000 Binary files a/resources/sprites/npc/tmp/idle/0.png and /dev/null differ diff --git a/resources/sprites/npc/tmp/pain/0.png b/resources/sprites/npc/tmp/pain/0.png deleted file mode 100644 index 80694a3..0000000 Binary files a/resources/sprites/npc/tmp/pain/0.png and /dev/null differ diff --git a/resources/sprites/npc/tmp/walk/0.png b/resources/sprites/npc/tmp/walk/0.png deleted file mode 100644 index 80694a3..0000000 Binary files a/resources/sprites/npc/tmp/walk/0.png and /dev/null differ diff --git a/resources/textures/bg.jpg b/resources/textures/bg.jpg new file mode 100644 index 0000000..9af70a4 Binary files /dev/null and b/resources/textures/bg.jpg differ diff --git a/settings.py b/settings.py index 36de065..7e08909 100644 --- a/settings.py +++ b/settings.py @@ -20,8 +20,8 @@ MOUSE_BORDER_RIGHT = WIDTH - MOUSE_BORDER_LEFT MOUSE_BORDER_TOP = 100 MOUSE_BORDER_BOTTOM = HEIGHT - MOUSE_BORDER_TOP -FLOOR_COLOR = (69, 69, 69) -ROOF_COLOR = (50, 50, 50) +FLOOR_COLOR = (140,101,52) #(69, 69, 69) +ROOF_COLOR = (113,95,58) #(50, 50, 50) FOV = math.pi / 3 HALF_FOV = FOV / 2