diff --git a/README.md b/README.md index b291898..40a947f 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ A rogue-like game built in bevy and rust. ### Credits: - `Toen's Medieval Strategy Sprite Pack` - Created by Andre Mari Coppola (http://toen.itch.io/toens-medieval-strategy) +- `GLACIAL MOUNTAINS: PARALLAX BACKGROUND` - GLACIAL MOUNTAINS: PARALLAX BACKGROUND (license: http://creativecommons.org/licenses/by/4.0/) ### Twitch Stream/Youtube playlist: Twitch streams can be found here: diff --git a/assets/textures/backgrounds/battle1.png b/assets/textures/backgrounds/battle1.png new file mode 100644 index 0000000..99d6867 Binary files /dev/null and b/assets/textures/backgrounds/battle1.png differ diff --git a/assets/textures/battle-mock.ase b/assets/textures/battle-mock.ase new file mode 100644 index 0000000..7b35b3b Binary files /dev/null and b/assets/textures/battle-mock.ase differ diff --git a/assets/textures/spider_sprite.png~ b/assets/textures/spider_sprite.png~ deleted file mode 100644 index d7101dc..0000000 Binary files a/assets/textures/spider_sprite.png~ and /dev/null differ diff --git a/src/game/camera/input.rs b/src/game/camera/input.rs index e419e30..d50cd64 100644 --- a/src/game/camera/input.rs +++ b/src/game/camera/input.rs @@ -4,7 +4,7 @@ use bevy::{ render::camera::Camera, }; use bevy::render::camera::CameraProjection; -use crate::game::GameState; +use crate::game::{GameState, gameplay::battle}; use super::CustomOrthographicProjection; @@ -29,12 +29,29 @@ impl Default for KeyboardConf { } pub fn camera_movement( + asset_server: Res, + mut commands: Commands, mut game_state: ResMut>, - time: Res