From 7e12ebdf945d40d6f11872cf5852c9bb54d1864f Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Sun, 22 Dec 2024 16:12:31 +0100 Subject: big WIP --- game/Config.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'game/Config.h') diff --git a/game/Config.h b/game/Config.h index ec753df..350cd02 100644 --- a/game/Config.h +++ b/game/Config.h @@ -1,5 +1,16 @@ #pragma once +#include + +static const crepe::Config ENGINE_CONFIG { + .log { + .level = crepe::Log::Level::DEBUG, + }, + .window_settings { + .window_title = "Jetpack joyride clone", + }, +}; + static constexpr int SORT_IN_LAY_BACK_BACKGROUND = 3; // For all scenes static constexpr int SORT_IN_LAY_BACKGROUND = 4; // For all scenes static constexpr int SORT_IN_LAY_FORE_BACKGROUND = 5; // For all scenes -- cgit v1.2.3 From b8acb539a3580bf0665fe435c55f33ba16cb507e Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Wed, 8 Jan 2025 09:58:34 +0100 Subject: WIP --- game/CMakeLists.txt | 2 +- game/Config.h | 7 ++++--- game/Random.cpp | 28 ++++++++++++++++++++++++++++ game/Random.h | 11 +++++++++++ game/main.cpp | 7 +++++-- game/prefab/ZapperPoolScript.cpp | 9 ++++++++- 6 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 game/Random.cpp create mode 100644 game/Random.h (limited to 'game/Config.h') diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt index 48844b7..5c7bb6b 100644 --- a/game/CMakeLists.txt +++ b/game/CMakeLists.txt @@ -4,7 +4,6 @@ set(CMAKE_C_STANDARD 11) set(CMAKE_CXX_STANDARD 20) set(CMAKE_EXPORT_COMPILE_COMMANDS 1) set(CMAKE_BUILD_TYPE Debug) - project(game C CXX) add_subdirectory(../src crepe) @@ -45,6 +44,7 @@ target_sources(main PUBLIC hud/HudSubScene.cpp hud/HudScript.cpp hud/SpeedScript.cpp + Random.cpp ) add_subdirectory(background) diff --git a/game/Config.h b/game/Config.h index 8c27226..95846d2 100644 --- a/game/Config.h +++ b/game/Config.h @@ -31,11 +31,12 @@ static constexpr int COLL_LAY_ZAPPER = 6; // Only for GameScene static constexpr int COLL_LAY_LASER = 7; // Only for GameScene static constexpr int COLL_LAY_MISSILE = 8; // Only for GameScene -static constexpr int GAME_HEIGHT = 800; // In game units +static constexpr float GAME_HEIGHT = 800; // In game units +static constexpr float HALLWAY_HEIGHT = 475; // In game units -static constexpr int VIEWPORT_X = 1100; // In game units +static constexpr float VIEWPORT_X = 1100; // In game units // 'GAME_HEIGHT' (below) should be replaced by '500' when game development is finished -static constexpr int VIEWPORT_Y = 500; // In game units +static constexpr float VIEWPORT_Y = 500; // In game units // Font settings static constexpr const char* FONT = "Jetpackia"; diff --git a/game/Random.cpp b/game/Random.cpp new file mode 100644 index 0000000..59be3c5 --- /dev/null +++ b/game/Random.cpp @@ -0,0 +1,28 @@ +#include + +#include "Random.h" + +float Random::f(float upper, float lower) { + float range = upper - lower; + float x = ((float) rand() / (float) (RAND_MAX)) * range; + return x + lower; +} + +double Random::d(double upper, double lower) { + double range = upper - lower; + double x = ((double) rand() / (double) (RAND_MAX)) * range; + return x + lower; +} + +int Random::i(int upper, int lower) { + int range = upper - lower; + int x = rand() % range; + return x + lower; +} + +unsigned Random::u(unsigned upper, unsigned lower) { + unsigned range = upper - lower; + unsigned x = rand() % range; + return x + lower; +} + diff --git a/game/Random.h b/game/Random.h new file mode 100644 index 0000000..cf05e87 --- /dev/null +++ b/game/Random.h @@ -0,0 +1,11 @@ +#pragma once + +class Random { +public: + static float f(float upper = 1.0, float lower = 0.0); + static double d(double upper = 1.0, double lower = 0.0); + static int i(int upper, int lower = 0); + static unsigned u(unsigned upper, unsigned lower = 0); + +}; + diff --git a/game/main.cpp b/game/main.cpp index bd5ca93..b6458b8 100644 --- a/game/main.cpp +++ b/game/main.cpp @@ -1,3 +1,5 @@ +#include + #include #include @@ -6,16 +8,17 @@ #include "menus/mainmenu/MainMenuScene.h" #include "menus/shop/ShopMenuScene.h" - using namespace crepe; int main() { + srand(time(NULL)); + Config::get_instance() = ENGINE_CONFIG; Engine gameloop; + gameloop.add_scene(); gameloop.add_scene(); gameloop.add_scene(); - gameloop.add_scene(); return gameloop.main(); } diff --git a/game/prefab/ZapperPoolScript.cpp b/game/prefab/ZapperPoolScript.cpp index e42adc9..c6ce1e7 100644 --- a/game/prefab/ZapperPoolScript.cpp +++ b/game/prefab/ZapperPoolScript.cpp @@ -1,9 +1,11 @@ #include #include "../Config.h" +#include "../Random.h" #include "ZapperPoolScript.h" #include "ZapperPoolSubScene.h" +#include "util/OptionalRef.h" using namespace crepe; using namespace std; @@ -24,9 +26,14 @@ void ZapperPoolScript::fixed_update(crepe::duration_t) { } void ZapperPoolScript::spawn_random() { + OptionalRef zapper = pool.get_next_zapper(); + if (!zapper) return; // pool exhausted + vec2 pos = this->get_camera_pos(); - logf(Log::DEBUG, "Spawning random zapper at {}", pos); + pos.y = Random::f(0.5, -0.5) * HALLWAY_HEIGHT; + zapper->place(pos, 0, Random::f(400, 200)); + logf(Log::DEBUG, "Spawning random zapper at {}", pos); } vec2 ZapperPoolScript::get_camera_pos() { -- cgit v1.2.3 From 7f7c5c56dce30d47c32fb57fad6d839d0990b054 Mon Sep 17 00:00:00 2001 From: WBoerenkamps Date: Wed, 8 Jan 2025 10:08:03 +0100 Subject: enemy spawn working + enemy shooting --- game/CMakeLists.txt | 8 +++ game/Config.h | 2 + game/GameScene.cpp | 34 +++++++++++-- game/StartGameScript.cpp | 23 ++++----- game/enemy/BattleScript.cpp | 53 ++++++++++++++++++++ game/enemy/BattleScript.h | 20 ++++++++ game/enemy/BattleWonEvent.h | 5 ++ game/enemy/EnemyBulletPool.cpp | 8 +++ game/enemy/EnemyBulletPool.h | 10 ++++ game/enemy/EnemyBulletScript.cpp | 36 ++++++++++++++ game/enemy/EnemyBulletScript.h | 11 +++++ game/enemy/EnemyBulletSubScene.cpp | 51 +++++++++++++++++++ game/enemy/EnemyBulletSubScene.h | 10 ++++ game/enemy/EnemyPool.h | 2 +- game/enemy/EnemyScript.cpp | 96 ++++++++++++++++++++++++++++++++++++ game/enemy/EnemyScript.h | 29 +++++++++-- game/enemy/EnemySubScene.cpp | 44 +++++++++++++---- game/player/PlayerBulletPool.cpp | 8 +++ game/player/PlayerBulletPool.h | 10 ++++ game/player/PlayerBulletScript.cpp | 39 +++++++++++++++ game/player/PlayerBulletScript.h | 11 +++++ game/player/PlayerBulletSubScene.cpp | 51 +++++++++++++++++++ game/player/PlayerBulletSubScene.h | 10 ++++ game/player/PlayerEndScript.cpp | 2 + game/player/PlayerScript.cpp | 37 ++++++++++++-- game/player/PlayerScript.h | 5 +- game/player/PlayerSubScene.cpp | 8 +-- 27 files changed, 587 insertions(+), 36 deletions(-) create mode 100644 game/enemy/BattleScript.cpp create mode 100644 game/enemy/BattleScript.h create mode 100644 game/enemy/BattleWonEvent.h create mode 100644 game/enemy/EnemyBulletPool.cpp create mode 100644 game/enemy/EnemyBulletPool.h create mode 100644 game/enemy/EnemyBulletScript.cpp create mode 100644 game/enemy/EnemyBulletScript.h create mode 100644 game/enemy/EnemyBulletSubScene.cpp create mode 100644 game/enemy/EnemyBulletSubScene.h create mode 100644 game/player/PlayerBulletPool.cpp create mode 100644 game/player/PlayerBulletPool.h create mode 100644 game/player/PlayerBulletScript.cpp create mode 100644 game/player/PlayerBulletScript.h create mode 100644 game/player/PlayerBulletSubScene.cpp create mode 100644 game/player/PlayerBulletSubScene.h (limited to 'game/Config.h') diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt index 819b88c..0e7fc6b 100644 --- a/game/CMakeLists.txt +++ b/game/CMakeLists.txt @@ -9,8 +9,13 @@ project(game C CXX) add_subdirectory(../src crepe) add_executable(main + enemy/BattleScript.cpp enemy/EnemyPool.cpp + enemy/EnemyBulletScript.cpp + enemy/EnemyBulletSubScene.cpp + enemy/EnemyBulletPool.cpp enemy/EnemySubScene.cpp + enemy/EnemyScript.cpp background/AquariumSubScene.cpp background/BackgroundSubScene.cpp background/ForestParallaxScript.cpp @@ -20,6 +25,9 @@ add_executable(main MoveCameraManualyScript.cpp player/PlayerScript.cpp player/PlayerSubScene.cpp + player/PlayerBulletPool.cpp + player/PlayerBulletScript.cpp + player/PlayerBulletSubScene.cpp StartGameScript.cpp player/PlayerEndScript.cpp background/StartSubScene.cpp diff --git a/game/Config.h b/game/Config.h index d6f8349..aa04018 100644 --- a/game/Config.h +++ b/game/Config.h @@ -16,6 +16,8 @@ static constexpr int COLL_LAY_WALL_FRAGS = 5; // Only for GameScene static constexpr int COLL_LAY_ZAPPER = 6; // Only for GameScene static constexpr int COLL_LAY_LASER = 7; // Only for GameScene static constexpr int COLL_LAY_MISSILE = 8; // Only for GameScene +static constexpr int COLL_LAY_BULLET = 9; // Only for GameScene +static constexpr int COLL_LAY_ENEMY = 10; // Only for GameScene static constexpr int GAME_HEIGHT = 800; // In game units diff --git a/game/GameScene.cpp b/game/GameScene.cpp index a8fcb47..af6fc61 100644 --- a/game/GameScene.cpp +++ b/game/GameScene.cpp @@ -5,7 +5,12 @@ #include "background/BackgroundSubScene.h" #include "player/PlayerSubScene.h" - +#include "player/PlayerBulletPool.h" +#include "player/PlayerBulletSubScene.h" +#include "enemy/EnemyPool.h" +#include "enemy/EnemySubScene.h" +#include "enemy/EnemyBulletPool.h" +#include "enemy/BattleScript.h" #include #include #include @@ -15,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -29,7 +35,7 @@ void GameScene::load_scene() { BackgroundSubScene background(*this); GameObject camera = new_object("camera", "camera", vec2(650, 0)); - camera.add_component( + Camera& camera_cam = camera.add_component( ivec2(990, 720), vec2(VIEWPORT_X, VIEWPORT_Y), Camera::Data { .bg_color = Color::RED, @@ -37,7 +43,13 @@ void GameScene::load_scene() { ); camera.add_component().set_script(); camera.add_component(Rigidbody::Data {}); - + AI& enemy_path_1 = camera.add_component(400); + enemy_path_1.make_oval_path(100, 100, camera.transform.position, 1.5708, true); + AI& enemy_path_2 = camera.add_component(400); + enemy_path_2.make_oval_path(100, 100, {0, 0}, 1.5708, true); + AI& enemy_path_3 = camera.add_component(400); + enemy_path_3.make_oval_path(100, 100, {0, 0}, 1.5708, true); + // camer.add_component PlayerSubScene player(*this); GameObject floor = new_object("floor", "game_world", vec2(0, 325)); @@ -116,6 +128,22 @@ void GameScene::load_scene() { .collision_layer = COLL_LAY_MISSILE, }); missile.add_component(vec2(100, 100)); + //Enemy pool + EnemyPool enemy_pool; + enemy_pool.create_enemies(*this); + PlayerBulletPool player_bullet_pool; + player_bullet_pool.create_bullets(*this); + //Enemy Bullet pool + // PlayerBulletSubScene player_bullet; + // player_bullet.create(*this); + EnemyBulletPool enemy_bullet_pool; + enemy_bullet_pool.create_bullets(*this); + BehaviorScript& script = camera.add_component().set_script(); + + // EnemySubScene enemy_sub_scene1; + // enemy_sub_scene1.create(*this); + // EnemySubScene enemy_sub_scene2; + // enemy_sub_scene2.create(*this); } string GameScene::get_name() const { return "scene1"; } diff --git a/game/StartGameScript.cpp b/game/StartGameScript.cpp index c786eb4..5698a53 100644 --- a/game/StartGameScript.cpp +++ b/game/StartGameScript.cpp @@ -1,3 +1,4 @@ +#include #include "StartGameScript.h" #include "Config.h" @@ -10,7 +11,7 @@ using namespace std; void StartGameScript::fixed_update(crepe::duration_t dt) { Transform & player_transform = this->get_components_by_name("player").front(); - + // cout << "startgameScript call speed: " << PLAYER_SPEED * dt.count() << endl; // Create hole in wall and activate panic lamp if (player_transform.position.x > 75 && !this->created_hole) { Sprite & lamp_sprite = this->get_components_by_name("start_end").back(); @@ -49,14 +50,14 @@ void StartGameScript::fixed_update(crepe::duration_t dt) { } // Start camera movement, enable player jumping and disable this script - if (player_transform.position.x > 500) { - Rigidbody & rb = this->get_components_by_name("camera").front(); - rb.data.linear_velocity = vec2(PLAYER_SPEED * dt.count(), 0); - BehaviorScript & player_script - = this->get_components_by_name("player").front(); - player_script.active = true; - BehaviorScript & this_script - = this->get_components_by_name("start_game_script").front(); - this_script.active = false; - } + // if (player_transform.position.x > 500) { + // Rigidbody & rb = this->get_components_by_name("camera").front(); + // rb.data.linear_velocity = vec2(PLAYER_SPEED * dt.count(), 0); + // BehaviorScript & player_script + // = this->get_components_by_name("player").front(); + // player_script.active = true; + // BehaviorScript & this_script + // = this->get_components_by_name("start_game_script").front(); + // this_script.active = false; + // } } diff --git a/game/enemy/BattleScript.cpp b/game/enemy/BattleScript.cpp new file mode 100644 index 0000000..463ddf3 --- /dev/null +++ b/game/enemy/BattleScript.cpp @@ -0,0 +1,53 @@ +#include +#include "BattleScript.h" +#include +#include "EnemyScript.h" +#include +#include +#include "BattleWonEvent.h" +#include "EnemyScript.h" +using namespace std; +using namespace crepe; +// stop player movement +// spawn enemies +// resume game once enemies are defeated +// optional: spawn lazers during fight +BattleScript::BattleScript(){ + engine.seed(rd()); +} +void BattleScript::init(){ + std::uniform_int_distribution dist(2,10); + int random_enemy_amount = dist(this->engine); + // this->create_battle(random_enemy_amount); + this->subscribe([this](const BattleStartEvent& e) -> bool { + return this->create_battle(e); + }); +} +void BattleScript::fixed_update(duration_t dt){ + bool enemies_alive = false; + RefVector enemy_scripts = this->get_components_by_tag("enemy"); + + for(BehaviorScript& script : enemy_scripts){ + if(script.active){ + enemies_alive = true; + } + } + if(!enemies_alive){ + this->trigger_event(); + } +} +bool BattleScript::create_battle(const BattleStartEvent& e){ + RefVector enemy_scripts = this->get_components_by_tag("enemy"); + std::uniform_real_distribution dist(10,30); + for(int i = 0; i < e.num_enemies;i++){ + BehaviorScript& script = enemy_scripts[i]; + script.active = true; + this->trigger_event(SpawnEnemyEvent{ + .speed = dist(engine), + .column = i, + },script.game_object_id); + + } + return true; +} + diff --git a/game/enemy/BattleScript.h b/game/enemy/BattleScript.h new file mode 100644 index 0000000..d239e70 --- /dev/null +++ b/game/enemy/BattleScript.h @@ -0,0 +1,20 @@ +#pragma once + +#include +#include +#include +#include +struct BattleStartEvent : public crepe::Event{ + public: + int num_enemies = 0; +}; +class BattleScript : public crepe::Script{ + public: + BattleScript(); + void init() override; + void fixed_update(crepe::duration_t dt) override; + private: + std::random_device rd; + std::default_random_engine engine; + bool create_battle(const BattleStartEvent& e); +}; diff --git a/game/enemy/BattleWonEvent.h b/game/enemy/BattleWonEvent.h new file mode 100644 index 0000000..a48dbad --- /dev/null +++ b/game/enemy/BattleWonEvent.h @@ -0,0 +1,5 @@ +#pragma once +#include +struct BattleWonEvent : public crepe::Event{ + +}; diff --git a/game/enemy/EnemyBulletPool.cpp b/game/enemy/EnemyBulletPool.cpp new file mode 100644 index 0000000..6ebd50a --- /dev/null +++ b/game/enemy/EnemyBulletPool.cpp @@ -0,0 +1,8 @@ +#include "EnemyBulletSubScene.h" +#include "EnemyBulletPool.h" +using namespace std; + +void EnemyBulletPool::create_bullets(crepe::Scene & scn) { + EnemyBulletSubScene bullet; + while(bullet.create(scn) < this->MAXIMUM_AMOUNT); +} diff --git a/game/enemy/EnemyBulletPool.h b/game/enemy/EnemyBulletPool.h new file mode 100644 index 0000000..e0de02c --- /dev/null +++ b/game/enemy/EnemyBulletPool.h @@ -0,0 +1,10 @@ +#pragma once + +#include + +class EnemyBulletPool { +public: + void create_bullets(crepe::Scene & scn); +private: + static constexpr int MAXIMUM_AMOUNT = 20; +}; diff --git a/game/enemy/EnemyBulletScript.cpp b/game/enemy/EnemyBulletScript.cpp new file mode 100644 index 0000000..561d086 --- /dev/null +++ b/game/enemy/EnemyBulletScript.cpp @@ -0,0 +1,36 @@ +#include +#include "EnemyBulletScript.h" +#include +#include +#include +using namespace crepe; +using namespace std; +void EnemyBulletScript::init(){ + this->subscribe([this](const CollisionEvent& e) -> bool { + return this->on_collide(e); + }); +} +void EnemyBulletScript::fixed_update(crepe::duration_t dt){ + Transform& transform = this->get_component(); + Camera& camera = this->get_components_by_name("camera").front(); + Transform& cam_transform = this->get_components_by_name("camera").front(); + + vec2 half_screen = camera.viewport_size / 2; + float despawn_location = cam_transform.position.x - half_screen.x - 50; + if(transform.position.x < despawn_location){ + this->despawn_bullet(); + } +} + +void EnemyBulletScript::despawn_bullet(){ + Transform& transform = this->get_component(); + Rigidbody& bullet_body = this->get_component(); + bullet_body.active = false; + transform.position = {0,-750}; +} + +bool EnemyBulletScript::on_collide(const CollisionEvent& e){ + cout << "collision happened with " << e.info.other.metadata.tag << endl; + //this->despawn_bullet(); + return false; +} diff --git a/game/enemy/EnemyBulletScript.h b/game/enemy/EnemyBulletScript.h new file mode 100644 index 0000000..822387f --- /dev/null +++ b/game/enemy/EnemyBulletScript.h @@ -0,0 +1,11 @@ +#pragma once +#include +#include + +class EnemyBulletScript : public crepe::Script{ + public: + void init() override; + void fixed_update(crepe::duration_t dt) override; + bool on_collide(const crepe::CollisionEvent& e); + void despawn_bullet(); +}; diff --git a/game/enemy/EnemyBulletSubScene.cpp b/game/enemy/EnemyBulletSubScene.cpp new file mode 100644 index 0000000..1660607 --- /dev/null +++ b/game/enemy/EnemyBulletSubScene.cpp @@ -0,0 +1,51 @@ +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "../Config.h" + + +#include "EnemyBulletSubScene.h" +#include "EnemyScript.h" +#include "EnemyBulletScript.h" +using namespace crepe; +using namespace std; +int EnemyBulletSubScene::create(Scene & scn){ + vec2 size = {20, 20}; + + static int counter = 0; + string unique_name = "enemyBullet_" + to_string(counter++); + GameObject bullet = scn.new_object(unique_name.c_str(),"EnemyBullet",vec2{0,-750},0,1); + + Rigidbody& bullet_body = bullet.add_component(Rigidbody::Data { + .gravity_scale = 0, + .body_type = Rigidbody::BodyType::DYNAMIC, + .linear_velocity = vec2{-300,0}, + .collision_layers = {COLL_LAY_PLAYER}, + .collision_layer = COLL_LAY_BULLET, + + + }); + bullet_body.active = false; + BoxCollider& bullet_collider = bullet.add_component(vec2(60, 40)); + bullet_collider.active = false; + Asset bullet_asset {"asset/other_effects/effect_smgbullet_x2.png"}; + Sprite & bullet_sprite = bullet.add_component( + bullet_asset, + Sprite::Data { + .flip = {true,false}, + .sorting_in_layer = SORT_IN_LAY_PLAYER, + .order_in_layer = 1, + .size = vec2(60,0), + } + ); + bullet.add_component().set_script(); + return counter; +} diff --git a/game/enemy/EnemyBulletSubScene.h b/game/enemy/EnemyBulletSubScene.h new file mode 100644 index 0000000..a7e30d7 --- /dev/null +++ b/game/enemy/EnemyBulletSubScene.h @@ -0,0 +1,10 @@ +#pragma once + +namespace crepe { +class Scene; +} + +class EnemyBulletSubScene { +public: + int create(crepe::Scene & scn); +}; diff --git a/game/enemy/EnemyPool.h b/game/enemy/EnemyPool.h index e2b9ddd..916b930 100644 --- a/game/enemy/EnemyPool.h +++ b/game/enemy/EnemyPool.h @@ -6,5 +6,5 @@ class EnemyPool { public: void create_enemies(crepe::Scene & scn); private: - static constexpr int MAXIMUM_AMOUNT = 100; + static constexpr int MAXIMUM_AMOUNT = 10; }; diff --git a/game/enemy/EnemyScript.cpp b/game/enemy/EnemyScript.cpp index e69de29..1fbefaa 100644 --- a/game/enemy/EnemyScript.cpp +++ b/game/enemy/EnemyScript.cpp @@ -0,0 +1,96 @@ +#include +#include "../Config.h" +#include "EnemyScript.h" +#include +#include +#include +#include +#include +#include +#include +using namespace crepe; +using namespace std; +EnemyScript::EnemyScript(){ + //cout << column << std::endl; + engine.seed(rd()); + this->last_fired = std::chrono::steady_clock::now(); +} +void EnemyScript::init(){ + Metadata& meta = this->get_component(); + this->subscribe([this](const SpawnEnemyEvent& e) -> bool{ + return this->spawn_enemy(e); + },meta.game_object_id); +}; +void EnemyScript::fixed_update(duration_t dt) { + + Transform& transform = this->get_component(); + Transform& player_transform = this->get_components_by_name("player").front(); + AI& ai_component = this->get_component(); + + float direction_to_player_y = player_transform.position.y - transform.position.y; + float distance_to_player_y = std::abs(direction_to_player_y); + + float adjustment_speed = speed * (distance_to_player_y / MAX_DISTANCE); + + adjustment_speed = std::clamp(adjustment_speed, MIN_SPEED, MAX_SPEED); + //cout << "speed: "<< adjustment_speed << endl; + //cout << "direction: " << direction_to_player_y << endl; + // Move the path nodes on the Y-axis + for (vec2& path_node : ai_component.path) { + path_node.y += (direction_to_player_y > 0 ? 1 : -1) * adjustment_speed * dt.count(); + } + //bullet fire logic: + + auto now = std::chrono::steady_clock::now(); + std::chrono::duration elapsed = now - last_fired; + if (elapsed > std::chrono::duration(5)) { + this->shoot(transform.position,0); + last_fired = now; + } + +} +bool EnemyScript::spawn_enemy(const SpawnEnemyEvent& e){ + this->speed = e.speed; + AI& ai_component = this->get_component(); + Transform& transform = this->get_component(); + Camera& camera = this->get_components_by_name("camera").front(); + Transform& cam_transform = this->get_components_by_name("camera").front(); + vec2 half_screen = camera.viewport_size / 2; + //cout << "column: " << e.column << endl; + float x_value = cam_transform.position.x + half_screen.x - 50 * (1 + e.column); + uniform_real_distribution dist( + cam_transform.position.y - half_screen.y + 100, + cam_transform.position.y + half_screen.y - 100 + ); + float random_height = dist(engine); + vec2 spawn_location = {cam_transform.position.x + camera.viewport_size.x / 2 + 100,random_height}; + transform.position = spawn_location; + // transform.position = vec2{cam_transform} + ai_component.path.clear(); + ai_component.make_oval_path(10, 10, vec2{x_value,random_height}, 1.5708, true); + + return true; +} + +void EnemyScript::onCollide(const CollisionEvent & collisionData){ + +} + +void EnemyScript::shoot(const vec2& location,float angle){ + //cout << "enemy shot" << endl; + RefVector bullet_transforms = this->get_components_by_tag("EnemyBullet"); + + for(Transform& bullet_pos : bullet_transforms){ + //cout << "bullet pos x: " << bullet_pos.position.x << " y: " << bullet_pos.position.y << endl; + if(bullet_pos.position.x == 0 && bullet_pos.position.y == -750){ + + bullet_pos.position = location; + bullet_pos.position.x -= 20; + Rigidbody& bullet_body = this->get_components_by_id(bullet_pos.game_object_id).front(); + BoxCollider bullet_collider = this->get_components_by_id(bullet_pos.game_object_id).front(); + bullet_collider.active = true; + bullet_body.active = true; + return; + } + } +} diff --git a/game/enemy/EnemyScript.h b/game/enemy/EnemyScript.h index 0ecf050..35d2626 100644 --- a/game/enemy/EnemyScript.h +++ b/game/enemy/EnemyScript.h @@ -1,7 +1,30 @@ #pragma once - +#include +#include +#include +#include +#include +#include +struct SpawnEnemyEvent : public crepe::Event{ + float speed = 0; + int column = 0; +}; class EnemyScript : public crepe::Script { + public: + EnemyScript(); void init() override; - void update() override; - void onCollide(const CollisionEvent & collisionData); + void fixed_update(crepe::duration_t dt) override; + void shoot(const crepe::vec2& position,float angle); + void onCollide(const crepe::CollisionEvent & collisionData); + bool spawn_enemy(const SpawnEnemyEvent& e); + private: + std::random_device rd; + std::default_random_engine engine; + + float speed = 50; + const float MIN_SPEED = 10; + const float MAX_SPEED = 130; + const float MAX_DISTANCE = 100; + std::chrono::time_point last_fired; + std::chrono::duration shot_delay; }; diff --git a/game/enemy/EnemySubScene.cpp b/game/enemy/EnemySubScene.cpp index 4a567b9..5618829 100644 --- a/game/enemy/EnemySubScene.cpp +++ b/game/enemy/EnemySubScene.cpp @@ -1,6 +1,7 @@ #include #include "EnemySubScene.h" +#include "EnemyScript.h" #include #include #include @@ -9,37 +10,56 @@ #include #include #include + +#include #include "../Config.h" using namespace crepe; using namespace std; int EnemySubScene::create(Scene & scn){ vec2 size = {20, 20}; - static int coin_counter = 0; - string unique_name = "enemy_" + to_string(coin_counter++); - GameObject enemy = scn.new_object(unique_name.c_str(),"enemy",vec2{650,0},0,1); + static int enemy_counter = 0; + string unique_name = "enemy_" + to_string(enemy_counter++); + GameObject enemy = scn.new_object(unique_name.c_str(),"enemy",vec2{0,-650},0,1); + enemy.add_component(Rigidbody::Data { .gravity_scale = 0, + .body_type = Rigidbody::BodyType::DYNAMIC, // .collision_layers // = {COLL_LAY_BOT_TOP, COLL_LAY_ZAPPER, COLL_LAY_LASER}, - .collision_layer = COLL_LAY_PLAYER, + .max_linear_velocity = 400, + .collision_layer = COLL_LAY_ENEMY, + }); - Asset enemy_body_asset {"asset/worker/worker1body.png"}; + Asset enemy_body_asset {"asset/workers/worker2Body.png"}; enemy.add_component(vec2(50, 50)); Sprite & enemy_body_sprite = enemy.add_component( enemy_body_asset, Sprite::Data { + .flip = {true,false}, .sorting_in_layer = SORT_IN_LAY_PLAYER, .order_in_layer = 0, .size = vec2(0, 50), } ); + Animator& body_animator = enemy.add_component( + enemy_body_sprite, ivec2(32, 32), uvec2(4, 8), + Animator::Data { + .fps = 5, + .col = 3, + .row = 1, + + .looping = false, + } + ); + body_animator.pause(); enemy.add_component(vec2(40, 60), vec2(-20, 0)); - Asset enemy_head_asset {"asset/workers/worker1Head.png"}; + Asset enemy_head_asset {"asset/workers/worker2Head.png"}; Sprite & enemy_head_sprite = enemy.add_component( enemy_head_asset, Sprite::Data { + .flip = {true,false}, .sorting_in_layer = SORT_IN_LAY_PLAYER, .order_in_layer = 1, .size = vec2(0, 50), @@ -58,13 +78,14 @@ int EnemySubScene::create(Scene & scn){ Sprite & enemy_jetpack_sprite = enemy.add_component( enemy_jetpack_asset, Sprite::Data { + .flip = {true,false}, .sorting_in_layer = SORT_IN_LAY_PLAYER, .order_in_layer = 2, .size = vec2(0, 60), - .position_offset = vec2(-20, 0), + .position_offset = vec2(20, 0), } ); - enemy_jetpack_sprite.active = false; + enemy_jetpack_sprite.active = true; enemy.add_component( enemy_jetpack_sprite, ivec2(32, 44), uvec2(4, 4), Animator::Data { @@ -72,5 +93,10 @@ int EnemySubScene::create(Scene & scn){ .looping = true, } ); - return coin_counter; + + AI& ai_component = enemy.add_component(3000); + ai_component.path_follow_on(); + BehaviorScript& enemy_script = enemy.add_component().set_script(); + enemy_script.active = false; + return enemy_counter; } diff --git a/game/player/PlayerBulletPool.cpp b/game/player/PlayerBulletPool.cpp new file mode 100644 index 0000000..63ef346 --- /dev/null +++ b/game/player/PlayerBulletPool.cpp @@ -0,0 +1,8 @@ +#include "PlayerBulletSubScene.h" +#include "PlayerBulletPool.h" +using namespace std; + +void PlayerBulletPool::create_bullets(crepe::Scene & scn) { + PlayerBulletSubScene bullet; + while(bullet.create(scn) < this->MAXIMUM_AMOUNT); +} diff --git a/game/player/PlayerBulletPool.h b/game/player/PlayerBulletPool.h new file mode 100644 index 0000000..a8ba2fb --- /dev/null +++ b/game/player/PlayerBulletPool.h @@ -0,0 +1,10 @@ +#pragma once + +#include + +class PlayerBulletPool { +public: + void create_bullets(crepe::Scene & scn); +private: + static constexpr int MAXIMUM_AMOUNT = 20; +}; diff --git a/game/player/PlayerBulletScript.cpp b/game/player/PlayerBulletScript.cpp new file mode 100644 index 0000000..e1637c2 --- /dev/null +++ b/game/player/PlayerBulletScript.cpp @@ -0,0 +1,39 @@ +#include + +#include +#include +#include + +#include "PlayerBulletScript.h" + +using namespace crepe; +using namespace std; +void PlayerBulletScript::init(){ + this->subscribe([this](const CollisionEvent& e) -> bool { + return this->on_collide(e); + }); +} +void PlayerBulletScript::fixed_update(crepe::duration_t dt){ + Transform& transform = this->get_component(); + Camera& camera = this->get_components_by_name("camera").front(); + Transform& cam_transform = this->get_components_by_name("camera").front(); + + vec2 half_screen = camera.viewport_size / 2; + float despawn_location = cam_transform.position.x + half_screen.x + 50; + if(transform.position.x < despawn_location){ + this->despawn_bullet(); + } +} + +void PlayerBulletScript::despawn_bullet(){ + Transform& transform = this->get_component(); + Rigidbody& bullet_body = this->get_component(); + bullet_body.active = false; + transform.position = {0,-850}; +} + +bool PlayerBulletScript::on_collide(const CollisionEvent& e){ + cout << "collision happened with " << e.info.other.metadata.tag << endl; + //this->despawn_bullet(); + return false; +} diff --git a/game/player/PlayerBulletScript.h b/game/player/PlayerBulletScript.h new file mode 100644 index 0000000..559b815 --- /dev/null +++ b/game/player/PlayerBulletScript.h @@ -0,0 +1,11 @@ +#pragma once +#include +#include + +class PlayerBulletScript : public crepe::Script{ + public: + void init() override; + void fixed_update(crepe::duration_t dt) override; + bool on_collide(const crepe::CollisionEvent& e); + void despawn_bullet(); +}; diff --git a/game/player/PlayerBulletSubScene.cpp b/game/player/PlayerBulletSubScene.cpp new file mode 100644 index 0000000..eb34046 --- /dev/null +++ b/game/player/PlayerBulletSubScene.cpp @@ -0,0 +1,51 @@ +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "../Config.h" + + +#include "PlayerBulletSubScene.h" +#include "PlayerScript.h" +#include "PlayerBulletScript.h" +using namespace crepe; +using namespace std; +int PlayerBulletSubScene::create(Scene & scn){ + vec2 size = {20, 20}; + + static int counter = 0; + string unique_name = "playerBullet_" + to_string(counter++); + GameObject player_bullet = scn.new_object(unique_name.c_str(),"PlayerBullet",vec2{0,-850},0,1); + + Rigidbody& player_bullet_body = player_bullet.add_component(Rigidbody::Data { + .gravity_scale = 0, + .body_type = Rigidbody::BodyType::DYNAMIC, + .linear_velocity = vec2{-300,0}, + .collision_layers = {COLL_LAY_PLAYER}, + .collision_layer = COLL_LAY_BULLET, + + + }); + player_bullet_body.active = false; + BoxCollider& player_bullet_collider = player_bullet.add_component(vec2(60, 40)); + player_bullet_collider.active = false; + Asset player_bullet_asset {"asset/other_effects/effect_smgbullet_x2.png"}; + Sprite & player_bullet_sprite = player_bullet.add_component( + player_bullet_asset, + Sprite::Data { + .flip = {true,false}, + .sorting_in_layer = SORT_IN_LAY_PLAYER, + .order_in_layer = 1, + .size = vec2(60,0), + } + ); + player_bullet.add_component().set_script(); + return counter; +} diff --git a/game/player/PlayerBulletSubScene.h b/game/player/PlayerBulletSubScene.h new file mode 100644 index 0000000..4b44dc4 --- /dev/null +++ b/game/player/PlayerBulletSubScene.h @@ -0,0 +1,10 @@ +#pragma once + +namespace crepe { +class Scene; +} + +class PlayerBulletSubScene { +public: + int create(crepe::Scene & scn); +}; diff --git a/game/player/PlayerEndScript.cpp b/game/player/PlayerEndScript.cpp index e04fb9d..fc3b8a1 100644 --- a/game/player/PlayerEndScript.cpp +++ b/game/player/PlayerEndScript.cpp @@ -1,3 +1,4 @@ +#include #include "PlayerEndScript.h" #include "../Config.h" @@ -22,6 +23,7 @@ void PlayerEndScript::init() { } bool PlayerEndScript::on_collision(const crepe::CollisionEvent & ev) { + cout << "collision player" << endl; if (ev.info.other.metadata.name == "floor") { Transform & transform_player = this->get_components_by_name("player").front(); diff --git a/game/player/PlayerScript.cpp b/game/player/PlayerScript.cpp index 472d7c8..8372080 100644 --- a/game/player/PlayerScript.cpp +++ b/game/player/PlayerScript.cpp @@ -1,10 +1,12 @@ +#include #include "PlayerScript.h" #include "../Config.h" - +#include "../enemy/BattleScript.h" #include #include #include +#include #include #include @@ -16,7 +18,6 @@ void PlayerScript::init() { return this->on_collision(ev); }); } - bool PlayerScript::on_collision(const CollisionEvent & ev) { BehaviorScript & play_scr = this->get_components_by_name("player").front(); BehaviorScript & end_scr = this->get_components_by_name("player").back(); @@ -77,8 +78,16 @@ void PlayerScript::fixed_update(crepe::duration_t dt) { for (ParticleEmitter & emitter : emitters) { emitter.data.boundary.offset = vec2(0, -transform.position.y); } - + Rigidbody & rb = this->get_components_by_name("player").front(); + if (this->get_key_state(Keycode::P)) { + this->trigger_event(BattleStartEvent{ + .num_enemies = 5, + }); + } + if(this->get_key_state(Keycode::ENTER)){ + this->shoot(transform.position,0); + } if (this->get_key_state(Keycode::SPACE)) { rb.add_force_linear(vec2(0, -PLAYER_GRAVITY_SCALE / 2.5) * dt.count() / 0.02); if (prev_anim != 1) { @@ -117,3 +126,25 @@ void PlayerScript::fixed_update(crepe::duration_t dt) { } } } + +void PlayerScript::shoot(const vec2& location,float angle){ + cout << "player shot" << endl; + RefVector bullet_transforms = this->get_components_by_tag("PlayerBullet"); + + for(Transform& bullet_pos : bullet_transforms){ + //cout << "bullet pos x: " << bullet_pos.position.x << " y: " << bullet_pos.position.y << endl; + if(bullet_pos.position.x == 0 && bullet_pos.position.y == -850){ + + cout << "bullet found\n"; + bullet_pos.position = location; + bullet_pos.position.x += 20; + cout << "bullet pos x: " << bullet_pos.position.x << " y: " << bullet_pos.position.y << endl; + Rigidbody& bullet_body = this->get_components_by_id(bullet_pos.game_object_id).front(); + BoxCollider bullet_collider = this->get_components_by_id(bullet_pos.game_object_id).front(); + //bullet_collider.active = true; + bullet_body.active = true; + return; + } + } + cout << "bullet not found\n"; +} diff --git a/game/player/PlayerScript.h b/game/player/PlayerScript.h index d8eb098..cdb466f 100644 --- a/game/player/PlayerScript.h +++ b/game/player/PlayerScript.h @@ -7,10 +7,11 @@ class PlayerScript : public crepe::Script { public: void init(); void fixed_update(crepe::duration_t dt); - + private: bool on_collision(const crepe::CollisionEvent & ev); - + // bool on_key_up(const crepe::KeyReleaseEvent& ev); + void shoot(const crepe::vec2& location,float angle); private: int prev_anim = 0; }; diff --git a/game/player/PlayerSubScene.cpp b/game/player/PlayerSubScene.cpp index c1e5e2f..99a0fb4 100644 --- a/game/player/PlayerSubScene.cpp +++ b/game/player/PlayerSubScene.cpp @@ -18,7 +18,7 @@ using namespace crepe; using namespace std; PlayerSubScene::PlayerSubScene(Scene & scn) { - GameObject player = scn.new_object("player", "player", vec2(-100, 200)); + GameObject player = scn.new_object("player", "player", vec2(300, 200)); Asset player_bullet {"asset/other_effects/effect_smgbullet.png"}; Sprite & player_bullet_sprite = player.add_component( @@ -143,11 +143,11 @@ PlayerSubScene::PlayerSubScene(Scene & scn) { player.add_component(Rigidbody::Data { .gravity_scale = PLAYER_GRAVITY_SCALE, .body_type = Rigidbody::BodyType::DYNAMIC, - .linear_velocity = vec2(PLAYER_SPEED * 0.02, 0), + //.linear_velocity = vec2(PLAYER_SPEED * 0.02, 0), .collision_layers - = {COLL_LAY_BOT_TOP, COLL_LAY_ZAPPER, COLL_LAY_LASER, COLL_LAY_MISSILE}, + = {COLL_LAY_BOT_TOP, COLL_LAY_ZAPPER, COLL_LAY_LASER, COLL_LAY_MISSILE,COLL_LAY_BULLET}, .collision_layer = COLL_LAY_PLAYER, }); - player.add_component().set_script().active = false; + player.add_component().set_script().active = true; player.add_component().set_script().active = false; } -- cgit v1.2.3 From 1a5744a3285a5ba5132fb4f6f031c27df1b64d33 Mon Sep 17 00:00:00 2001 From: WBoerenkamps Date: Wed, 8 Jan 2025 12:17:30 +0100 Subject: enemy death working --- game/Config.h | 1 + game/GameScene.cpp | 12 +++++++--- game/enemy/EnemyBulletScript.cpp | 8 ++++--- game/enemy/EnemyBulletSubScene.cpp | 16 ++++++------- game/enemy/EnemyScript.cpp | 45 +++++++++++++++++++++++------------- game/enemy/EnemyScript.h | 7 +++--- game/enemy/EnemySubScene.cpp | 3 +-- game/main.cpp | 3 ++- game/player/PlayerBulletScript.cpp | 10 +++++--- game/player/PlayerBulletSubScene.cpp | 18 ++++++++------- game/player/PlayerEndScript.cpp | 2 -- game/player/PlayerScript.cpp | 12 ++++++---- game/player/PlayerSubScene.cpp | 2 +- 13 files changed, 84 insertions(+), 55 deletions(-) (limited to 'game/Config.h') diff --git a/game/Config.h b/game/Config.h index f787772..5b483cc 100644 --- a/game/Config.h +++ b/game/Config.h @@ -21,6 +21,7 @@ static constexpr int COLL_LAY_LASER = 7; // Only for GameScene static constexpr int COLL_LAY_MISSILE = 8; // Only for GameScene static constexpr int COLL_LAY_BULLET = 9; // Only for GameScene static constexpr int COLL_LAY_ENEMY = 10; // Only for GameScene +static constexpr int COLL_LAY_PLAYER_BULLET = 11; // Only for GameScene static constexpr int GAME_HEIGHT = 800; // In game units diff --git a/game/GameScene.cpp b/game/GameScene.cpp index 383d96c..7c2166d 100644 --- a/game/GameScene.cpp +++ b/game/GameScene.cpp @@ -16,7 +16,8 @@ #include "enemy/EnemyPool.h" #include "enemy/EnemySubScene.h" #include "enemy/EnemyBulletPool.h" -#include "enemy/BattleScript.h"#include "workers/WorkersSubScene.h" +#include "enemy/BattleScript.h" +#include "workers/WorkersSubScene.h" #include #include @@ -53,7 +54,7 @@ void GameScene::load_scene() { camera.add_component().set_script(); camera.add_component().set_script(); camera.add_component().set_script(); - + camera.add_component().set_script(); camera.add_component(Rigidbody::Data {}); AI& enemy_path_1 = camera.add_component(400); enemy_path_1.make_oval_path(100, 100, camera.transform.position, 1.5708, true); @@ -96,7 +97,12 @@ void GameScene::load_scene() { //create coin pool CoinPoolSubScene coin_system; coin_system.create_coins(*this); - + EnemyBulletPool enemy_bullet_pool; + enemy_bullet_pool.create_bullets(*this); + PlayerBulletPool player_bullet_pool; + player_bullet_pool.create_bullets(*this); + EnemyPool enemy_pool; + enemy_pool.create_enemies(*this); HudSubScene hud; hud.create(*this); GameObject background_music = new_object("background_music", "audio", vec2(0, 0)); diff --git a/game/enemy/EnemyBulletScript.cpp b/game/enemy/EnemyBulletScript.cpp index 561d086..ba27b9d 100644 --- a/game/enemy/EnemyBulletScript.cpp +++ b/game/enemy/EnemyBulletScript.cpp @@ -14,7 +14,9 @@ void EnemyBulletScript::fixed_update(crepe::duration_t dt){ Transform& transform = this->get_component(); Camera& camera = this->get_components_by_name("camera").front(); Transform& cam_transform = this->get_components_by_name("camera").front(); - + Rigidbody& bullet_body = this->get_component(); + //move + transform.position.x += bullet_body.data.linear_velocity.x * dt.count(); vec2 half_screen = camera.viewport_size / 2; float despawn_location = cam_transform.position.x - half_screen.x - 50; if(transform.position.x < despawn_location){ @@ -30,7 +32,7 @@ void EnemyBulletScript::despawn_bullet(){ } bool EnemyBulletScript::on_collide(const CollisionEvent& e){ - cout << "collision happened with " << e.info.other.metadata.tag << endl; - //this->despawn_bullet(); + //cout << "collision happened with " << e.info.other.metadata.tag << endl; + this->despawn_bullet(); return false; } diff --git a/game/enemy/EnemyBulletSubScene.cpp b/game/enemy/EnemyBulletSubScene.cpp index 1660607..488dc03 100644 --- a/game/enemy/EnemyBulletSubScene.cpp +++ b/game/enemy/EnemyBulletSubScene.cpp @@ -21,21 +21,21 @@ int EnemyBulletSubScene::create(Scene & scn){ vec2 size = {20, 20}; static int counter = 0; - string unique_name = "enemyBullet_" + to_string(counter++); - GameObject bullet = scn.new_object(unique_name.c_str(),"EnemyBullet",vec2{0,-750},0,1); + string unique_name = "enemy_bullet_" + to_string(counter++); + GameObject bullet = scn.new_object(unique_name.c_str(),"enemy_bullet",vec2{0,-750},0,1); Rigidbody& bullet_body = bullet.add_component(Rigidbody::Data { .gravity_scale = 0, - .body_type = Rigidbody::BodyType::DYNAMIC, - .linear_velocity = vec2{-300,0}, - .collision_layers = {COLL_LAY_PLAYER}, - .collision_layer = COLL_LAY_BULLET, - + .body_type = Rigidbody::BodyType::KINEMATIC, + .linear_velocity = vec2{-300,0}, + .kinematic_collision = false, + .collision_layers = {COLL_LAY_MISSILE}, + .collision_layer = COLL_LAY_BULLET }); bullet_body.active = false; BoxCollider& bullet_collider = bullet.add_component(vec2(60, 40)); - bullet_collider.active = false; + //bullet_collider.active = false; Asset bullet_asset {"asset/other_effects/effect_smgbullet_x2.png"}; Sprite & bullet_sprite = bullet.add_component( bullet_asset, diff --git a/game/enemy/EnemyScript.cpp b/game/enemy/EnemyScript.cpp index 1fbefaa..2bdab2c 100644 --- a/game/enemy/EnemyScript.cpp +++ b/game/enemy/EnemyScript.cpp @@ -1,4 +1,3 @@ -#include #include "../Config.h" #include "EnemyScript.h" #include @@ -8,44 +7,51 @@ #include #include #include +#include +#include "../Random.h" using namespace crepe; using namespace std; EnemyScript::EnemyScript(){ - //cout << column << std::endl; engine.seed(rd()); this->last_fired = std::chrono::steady_clock::now(); + this->shot_delay = std::chrono::duration(2.5 + Random::f(0,1)); } void EnemyScript::init(){ Metadata& meta = this->get_component(); this->subscribe([this](const SpawnEnemyEvent& e) -> bool{ return this->spawn_enemy(e); },meta.game_object_id); + this->subscribe([this](const CollisionEvent& e) -> bool { + return this->on_collide(e); + }); }; void EnemyScript::fixed_update(duration_t dt) { - + if(this->alive){ + return; + } Transform& transform = this->get_component(); Transform& player_transform = this->get_components_by_name("player").front(); + Rigidbody& enemy_body = this->get_component(); AI& ai_component = this->get_component(); - + + //transform.position += enemy_body.data.linear_velocity * dt.count(); float direction_to_player_y = player_transform.position.y - transform.position.y; float distance_to_player_y = std::abs(direction_to_player_y); float adjustment_speed = speed * (distance_to_player_y / MAX_DISTANCE); adjustment_speed = std::clamp(adjustment_speed, MIN_SPEED, MAX_SPEED); - //cout << "speed: "<< adjustment_speed << endl; - //cout << "direction: " << direction_to_player_y << endl; // Move the path nodes on the Y-axis for (vec2& path_node : ai_component.path) { path_node.y += (direction_to_player_y > 0 ? 1 : -1) * adjustment_speed * dt.count(); } //bullet fire logic: - auto now = std::chrono::steady_clock::now(); std::chrono::duration elapsed = now - last_fired; - if (elapsed > std::chrono::duration(5)) { + if (elapsed > shot_delay) { this->shoot(transform.position,0); last_fired = now; + this->shot_delay = std::chrono::duration(Random::f(0.8,4)); } } @@ -55,8 +61,8 @@ bool EnemyScript::spawn_enemy(const SpawnEnemyEvent& e){ Transform& transform = this->get_component(); Camera& camera = this->get_components_by_name("camera").front(); Transform& cam_transform = this->get_components_by_name("camera").front(); + vec2 half_screen = camera.viewport_size / 2; - //cout << "column: " << e.column << endl; float x_value = cam_transform.position.x + half_screen.x - 50 * (1 + e.column); uniform_real_distribution dist( cam_transform.position.y - half_screen.y + 100, @@ -68,20 +74,27 @@ bool EnemyScript::spawn_enemy(const SpawnEnemyEvent& e){ // transform.position = vec2{cam_transform} ai_component.path.clear(); ai_component.make_oval_path(10, 10, vec2{x_value,random_height}, 1.5708, true); - + ai_component.active = true; return true; } -void EnemyScript::onCollide(const CollisionEvent & collisionData){ - +bool EnemyScript::on_collide(const CollisionEvent & e){ + if(e.info.other.metadata.tag == "player_bullet"){ + this->despawn_enemy(); + } + return false; +} +void EnemyScript::despawn_enemy(){ + Transform& transform = this->get_component(); + transform.position = vec2{0,-650}; + AI& ai_component = this->get_component(); + // Rigidbody& enemy_body + ai_component.active = false; } - void EnemyScript::shoot(const vec2& location,float angle){ - //cout << "enemy shot" << endl; - RefVector bullet_transforms = this->get_components_by_tag("EnemyBullet"); + RefVector bullet_transforms = this->get_components_by_tag("enemy_bullet"); for(Transform& bullet_pos : bullet_transforms){ - //cout << "bullet pos x: " << bullet_pos.position.x << " y: " << bullet_pos.position.y << endl; if(bullet_pos.position.x == 0 && bullet_pos.position.y == -750){ bullet_pos.position = location; diff --git a/game/enemy/EnemyScript.h b/game/enemy/EnemyScript.h index 35d2626..7babe4d 100644 --- a/game/enemy/EnemyScript.h +++ b/game/enemy/EnemyScript.h @@ -15,16 +15,17 @@ class EnemyScript : public crepe::Script { void init() override; void fixed_update(crepe::duration_t dt) override; void shoot(const crepe::vec2& position,float angle); - void onCollide(const crepe::CollisionEvent & collisionData); + bool on_collide(const crepe::CollisionEvent & collisionData); + void despawn_enemy(); bool spawn_enemy(const SpawnEnemyEvent& e); private: std::random_device rd; std::default_random_engine engine; - + bool alive = false; float speed = 50; const float MIN_SPEED = 10; const float MAX_SPEED = 130; const float MAX_DISTANCE = 100; std::chrono::time_point last_fired; - std::chrono::duration shot_delay; + std::chrono::duration shot_delay = std::chrono::duration(0); }; diff --git a/game/enemy/EnemySubScene.cpp b/game/enemy/EnemySubScene.cpp index 5618829..43f9b33 100644 --- a/game/enemy/EnemySubScene.cpp +++ b/game/enemy/EnemySubScene.cpp @@ -26,9 +26,8 @@ int EnemySubScene::create(Scene & scn){ .gravity_scale = 0, .body_type = Rigidbody::BodyType::DYNAMIC, - // .collision_layers - // = {COLL_LAY_BOT_TOP, COLL_LAY_ZAPPER, COLL_LAY_LASER}, .max_linear_velocity = 400, + .collision_layers = {COLL_LAY_BOT_TOP,COLL_LAY_PLAYER_BULLET}, .collision_layer = COLL_LAY_ENEMY, }); diff --git a/game/main.cpp b/game/main.cpp index e341353..3f7e17e 100644 --- a/game/main.cpp +++ b/game/main.cpp @@ -9,9 +9,10 @@ using namespace crepe; int main() { Engine gameloop; + gameloop.add_scene(); gameloop.add_scene(); gameloop.add_scene(); - gameloop.add_scene(); + return gameloop.main(); } diff --git a/game/player/PlayerBulletScript.cpp b/game/player/PlayerBulletScript.cpp index 50b6617..2bd067d 100644 --- a/game/player/PlayerBulletScript.cpp +++ b/game/player/PlayerBulletScript.cpp @@ -17,7 +17,9 @@ void PlayerBulletScript::fixed_update(crepe::duration_t dt){ Transform& transform = this->get_component(); Camera& camera = this->get_components_by_name("camera").front(); Transform& cam_transform = this->get_components_by_name("camera").front(); - + Rigidbody& bullet_body = this->get_component(); + transform.rotation += bullet_body.data.angular_velocity; + transform.position += bullet_body.data.linear_velocity * dt.count(); vec2 half_screen = camera.viewport_size / 2; float despawn_location = cam_transform.position.x + half_screen.x + 50; if(transform.position.x > despawn_location){ @@ -29,11 +31,13 @@ void PlayerBulletScript::despawn_bullet(){ Transform& transform = this->get_component(); Rigidbody& bullet_body = this->get_component(); bullet_body.active = false; + BehaviorScript& bullet_script = this->get_component(); + bullet_script.active = false; transform.position = {0,-850}; } bool PlayerBulletScript::on_collide(const CollisionEvent& e){ - cout << "collision happened with " << e.info.other.metadata.tag << endl; - //this->despawn_bullet(); + cout << "player bullet collision happened with " << e.info.other.metadata.tag << endl; + this->despawn_bullet(); return false; } diff --git a/game/player/PlayerBulletSubScene.cpp b/game/player/PlayerBulletSubScene.cpp index eb89260..4b36387 100644 --- a/game/player/PlayerBulletSubScene.cpp +++ b/game/player/PlayerBulletSubScene.cpp @@ -21,22 +21,24 @@ using namespace std; int PlayerBulletSubScene::create(Scene & scn){ vec2 size = {20, 20}; static int counter = 0; - string unique_name = "playerBullet_" + to_string(counter++); - GameObject player_bullet = scn.new_object(unique_name.c_str(),"PlayerBullet",vec2{0,-850},0,1); + string unique_name = "player_bullet_" + to_string(counter++); + GameObject player_bullet = scn.new_object(unique_name.c_str(),"player_bullet",vec2{0,-850},0,1); Rigidbody& player_bullet_body = player_bullet.add_component(Rigidbody::Data { .gravity_scale = 0, - .body_type = Rigidbody::BodyType::DYNAMIC, + .body_type = Rigidbody::BodyType::KINEMATIC, .linear_velocity = vec2{300,0}, .angular_velocity = 150, - // .collision_layers = {COLL_LAY_PLAYER}, - // .collision_layer = COLL_LAY_BULLET, - + .kinematic_collision = false, + .collision_layers = {COLL_LAY_ENEMY}, + + .collision_layer = COLL_LAY_PLAYER_BULLET, + }); player_bullet_body.active = false; BoxCollider& player_bullet_collider = player_bullet.add_component(vec2(60, 40)); - player_bullet_collider.active = false; + //player_bullet_collider.active = false; Asset player_bullet_asset {"asset/other_effects/crepe.png"}; Sprite & player_bullet_sprite = player_bullet.add_component( player_bullet_asset, @@ -47,6 +49,6 @@ int PlayerBulletSubScene::create(Scene & scn){ .size = vec2(30,0), } ); - player_bullet.add_component().set_script(); + player_bullet.add_component().set_script().active = false; return counter; } diff --git a/game/player/PlayerEndScript.cpp b/game/player/PlayerEndScript.cpp index 92e48e3..fb18f2f 100644 --- a/game/player/PlayerEndScript.cpp +++ b/game/player/PlayerEndScript.cpp @@ -1,4 +1,3 @@ -#include #include "PlayerEndScript.h" #include "../Config.h" @@ -24,7 +23,6 @@ void PlayerEndScript::init() { } bool PlayerEndScript::on_collision(const crepe::CollisionEvent & ev) { - cout << "collision player" << endl; if (ev.info.other.metadata.name == "floor") { Transform & transform_player = this->get_components_by_name("player").front(); diff --git a/game/player/PlayerScript.cpp b/game/player/PlayerScript.cpp index 4e253f4..dc3eec3 100644 --- a/game/player/PlayerScript.cpp +++ b/game/player/PlayerScript.cpp @@ -61,7 +61,7 @@ bool PlayerScript::on_collision(const CollisionEvent & ev) { audio.play(); return false; - } else if (ev.info.other.metadata.tag == "missile") { + } else if (ev.info.other.metadata.tag == "missile" || ev.info.other.metadata.tag == "enemy_bullet") { for (Animator & anim : animators) { anim.active = true; anim.set_anim(5); @@ -157,21 +157,23 @@ void PlayerScript::fixed_update(crepe::duration_t dt) { } void PlayerScript::shoot(const vec2& location,float angle){ - cout << "player shot" << endl; - RefVector bullet_transforms = this->get_components_by_tag("PlayerBullet"); + //cout << "player shot" << endl; + RefVector bullet_transforms = this->get_components_by_tag("player_bullet"); for(Transform& bullet_pos : bullet_transforms){ //cout << "bullet pos x: " << bullet_pos.position.x << " y: " << bullet_pos.position.y << endl; if(bullet_pos.position.x == 0 && bullet_pos.position.y == -850){ - cout << "bullet found\n"; + //cout << "bullet found\n"; bullet_pos.position = location; bullet_pos.position.x += 20; - cout << "bullet pos x: " << bullet_pos.position.x << " y: " << bullet_pos.position.y << endl; + //cout << "bullet pos x: " << bullet_pos.position.x << " y: " << bullet_pos.position.y << endl; Rigidbody& bullet_body = this->get_components_by_id(bullet_pos.game_object_id).front(); BoxCollider bullet_collider = this->get_components_by_id(bullet_pos.game_object_id).front(); //bullet_collider.active = true; bullet_body.active = true; + BehaviorScript& bullet_script = this->get_components_by_id(bullet_pos.game_object_id).front(); + bullet_script.active = true; return; } } diff --git a/game/player/PlayerSubScene.cpp b/game/player/PlayerSubScene.cpp index be104b5..1203ca0 100644 --- a/game/player/PlayerSubScene.cpp +++ b/game/player/PlayerSubScene.cpp @@ -152,7 +152,7 @@ PlayerSubScene::PlayerSubScene(Scene & scn) { = {COLL_LAY_BOT_TOP, COLL_LAY_ZAPPER, COLL_LAY_LASER, COLL_LAY_MISSILE,COLL_LAY_BULLET}, .collision_layer = COLL_LAY_PLAYER, }); - player.add_component().set_script().active = false; + player.add_component().set_script().active = true; player.add_component().set_script(); player.add_component().set_script().active = false; -- cgit v1.2.3 From 12cf43dd062f41af226e0ac038b2f2838391015f Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Wed, 8 Jan 2025 15:24:38 +0100 Subject: `make format` --- game/Config.h | 3 +-- game/Random.cpp | 5 +---- game/Random.h | 1 - game/menus/mainmenu/ITransitionScript.cpp | 2 +- game/menus/shop/ShopMenuScene.cpp | 3 +-- game/prefab/ZapperObject.cpp | 1 - game/prefab/ZapperPoolScript.cpp | 12 ++++++------ game/prefab/ZapperPoolScript.h | 1 - game/prefab/ZapperPoolSubScene.cpp | 5 ++--- game/prefab/ZapperPoolSubScene.h | 4 ++-- src/crepe/api/Vector2.hpp | 4 ++-- 11 files changed, 16 insertions(+), 25 deletions(-) (limited to 'game/Config.h') diff --git a/game/Config.h b/game/Config.h index 64f2828..580e9ec 100644 --- a/game/Config.h +++ b/game/Config.h @@ -58,5 +58,4 @@ static constexpr const char * PLAYER_NAME = "player"; static constexpr int PLAYER_SPEED = 7500; // In game units static constexpr int PLAYER_GRAVITY_SCALE = 60; // In game units -static constexpr const char* CAMERA_NAME = "camera"; - +static constexpr const char * CAMERA_NAME = "camera"; diff --git a/game/Random.cpp b/game/Random.cpp index 821ddc8..64cf1f3 100644 --- a/game/Random.cpp +++ b/game/Random.cpp @@ -26,7 +26,4 @@ unsigned Random::u(unsigned upper, unsigned lower) { return x + lower; } -bool Random::b() { - return rand() % 2; -} - +bool Random::b() { return rand() % 2; } diff --git a/game/Random.h b/game/Random.h index 4a1108a..94f98d2 100644 --- a/game/Random.h +++ b/game/Random.h @@ -8,4 +8,3 @@ public: static unsigned u(unsigned upper, unsigned lower = 0); static bool b(); }; - diff --git a/game/menus/mainmenu/ITransitionScript.cpp b/game/menus/mainmenu/ITransitionScript.cpp index 3e51a90..54b0875 100644 --- a/game/menus/mainmenu/ITransitionScript.cpp +++ b/game/menus/mainmenu/ITransitionScript.cpp @@ -1,8 +1,8 @@ #include "ITransitionScript.h" #include "MainMenuConfig.h" -#include "../MenusConfig.h" #include "../../Config.h" +#include "../MenusConfig.h" #include #include diff --git a/game/menus/shop/ShopMenuScene.cpp b/game/menus/shop/ShopMenuScene.cpp index f4d5e76..d4542ba 100644 --- a/game/menus/shop/ShopMenuScene.cpp +++ b/game/menus/shop/ShopMenuScene.cpp @@ -1,11 +1,10 @@ #include "ShopMenuScene.h" +#include "../../Config.h" #include "../BannerSubScene.h" #include "../ButtonSubScene.h" #include "../MenusConfig.h" -#include "../BannerSubScene.h" -#include "../../Config.h" #include #include diff --git a/game/prefab/ZapperObject.cpp b/game/prefab/ZapperObject.cpp index 6139d53..24bbbd2 100644 --- a/game/prefab/ZapperObject.cpp +++ b/game/prefab/ZapperObject.cpp @@ -116,4 +116,3 @@ void ZapperObject::set_active(bool active) { this->active = active; } - diff --git a/game/prefab/ZapperPoolScript.cpp b/game/prefab/ZapperPoolScript.cpp index 168637c..b832ddd 100644 --- a/game/prefab/ZapperPoolScript.cpp +++ b/game/prefab/ZapperPoolScript.cpp @@ -23,23 +23,24 @@ void ZapperPoolScript::init() { } void ZapperPoolScript::fixed_update(crepe::duration_t) { - float threshold = camera_transform->position.x - camera_camera->viewport_size.x / 2 - OFFSCREEN_MARGIN; + float threshold + = camera_transform->position.x - camera_camera->viewport_size.x / 2 - OFFSCREEN_MARGIN; for (ZapperObject & zapper : this->pool) { if (!zapper.active) continue; - if (zapper.transform.position.x < threshold) - zapper.set_active(false); + if (zapper.transform.position.x < threshold) zapper.set_active(false); } } void ZapperPoolScript::spawn_random() { OptionalRef zapper = this->get_next_zapper(); if (!zapper) return; // pool exhausted - + bool horizontal = Random::b(); vec2 pos; float rotation, length; - pos.x = camera_transform->position.x + camera_camera->viewport_size.x / 2 + OFFSCREEN_MARGIN; + pos.x + = camera_transform->position.x + camera_camera->viewport_size.x / 2 + OFFSCREEN_MARGIN; if (horizontal) { rotation = 90; @@ -67,4 +68,3 @@ OptionalRef ZapperPoolScript::get_next_zapper() { } return {}; } - diff --git a/game/prefab/ZapperPoolScript.h b/game/prefab/ZapperPoolScript.h index dd60071..2208c80 100644 --- a/game/prefab/ZapperPoolScript.h +++ b/game/prefab/ZapperPoolScript.h @@ -31,4 +31,3 @@ private: static constexpr float MAX_LENGTH = 400; static constexpr float OFFSCREEN_MARGIN = 50 + MAX_LENGTH; }; - diff --git a/game/prefab/ZapperPoolSubScene.cpp b/game/prefab/ZapperPoolSubScene.cpp index e341090..8422b8c 100644 --- a/game/prefab/ZapperPoolSubScene.cpp +++ b/game/prefab/ZapperPoolSubScene.cpp @@ -1,13 +1,13 @@ #include -#include "ZapperPoolSubScene.h" #include "ZapperPoolScript.h" +#include "ZapperPoolSubScene.h" using namespace crepe; using namespace std; ZapperPoolSubScene::ZapperPoolSubScene(Scene & scene) - : controller { scene.new_object("controller") } { + : controller {scene.new_object("controller")} { Log::logf(Log::DEBUG, "Building zapper pool..."); vector pool; @@ -16,4 +16,3 @@ ZapperPoolSubScene::ZapperPoolSubScene(Scene & scene) BehaviorScript & behavior = this->controller.add_component(); behavior.set_script(std::move(pool)); } - diff --git a/game/prefab/ZapperPoolSubScene.h b/game/prefab/ZapperPoolSubScene.h index f930e22..6f6e297 100644 --- a/game/prefab/ZapperPoolSubScene.h +++ b/game/prefab/ZapperPoolSubScene.h @@ -1,8 +1,8 @@ #pragma once -#include -#include #include +#include +#include #include class CreateZapperEvent : public crepe::Event {}; diff --git a/src/crepe/api/Vector2.hpp b/src/crepe/api/Vector2.hpp index e2f96ed..30441d2 100644 --- a/src/crepe/api/Vector2.hpp +++ b/src/crepe/api/Vector2.hpp @@ -180,7 +180,7 @@ Vector2 Vector2::rotate(float deg) const { } // namespace crepe template -std::format_context::iterator std::formatter>::format(crepe::Vector2 vec, format_context & ctx) const { +std::format_context::iterator +std::formatter>::format(crepe::Vector2 vec, format_context & ctx) const { return formatter::format(std::format("{{{}, {}}}", vec.x, vec.y), ctx); } - -- cgit v1.2.3 From 1ec7e724fcace1274473dfcae91022cc1c930baa Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Wed, 8 Jan 2025 15:57:05 +0100 Subject: working scheduler and enemies and rest --- game/Config.h | 1 + game/GameScene.cpp | 4 ++-- game/enemy/BattleScript.cpp | 2 +- game/enemy/EnemyScript.cpp | 3 +-- game/scheduler/ObjectsScheduler.cpp | 8 +++----- game/scheduler/ObjectsScheduler.h | 4 ++-- 6 files changed, 10 insertions(+), 12 deletions(-) (limited to 'game/Config.h') diff --git a/game/Config.h b/game/Config.h index 58a51f2..e4f617a 100644 --- a/game/Config.h +++ b/game/Config.h @@ -63,3 +63,4 @@ static constexpr int PLAYER_GRAVITY_SCALE = 60; // In game units // Jetpack particles static constexpr const char * JETPACK_PARTICLES = "jetpack_particles"; +static constexpr const char * CAMERA_NAME = "camera"; diff --git a/game/GameScene.cpp b/game/GameScene.cpp index 07275ab..4cb3671 100644 --- a/game/GameScene.cpp +++ b/game/GameScene.cpp @@ -61,9 +61,9 @@ void GameScene::load_scene() { camera.add_component().set_script(); camera.add_component().set_script(); camera.add_component().set_script(); - camera.add_component().set_script(); - camera.add_component().set_script(); camera.add_component().set_script(); + camera.add_component().set_script(); + camera.add_component().set_script(); camera.add_component(Rigidbody::Data {}); AI & enemy_path_1 = camera.add_component(400); diff --git a/game/enemy/BattleScript.cpp b/game/enemy/BattleScript.cpp index dde8da1..4260c42 100644 --- a/game/enemy/BattleScript.cpp +++ b/game/enemy/BattleScript.cpp @@ -39,7 +39,7 @@ bool BattleScript::create_battle(const BattleStartEvent & e) { for (int i = 0; i < e.num_enemies; i++) { BehaviorScript & script = enemy_scripts[i]; script.active = true; - this->trigger_event( + this->queue_event( SpawnEnemyEvent { .speed = dist(engine), .column = i, diff --git a/game/enemy/EnemyScript.cpp b/game/enemy/EnemyScript.cpp index 8e475a8..07ed9e8 100644 --- a/game/enemy/EnemyScript.cpp +++ b/game/enemy/EnemyScript.cpp @@ -84,8 +84,7 @@ bool EnemyScript::spawn_enemy(const SpawnEnemyEvent & e) { bool EnemyScript::on_collide(const CollisionEvent & e) { if (e.info.other.metadata.tag == "player_bullet") { - //this->despawn_enemy(); - + this->despawn_enemy(); } Animator& body_animator = this->get_components().front(); body_animator.data.col = 2; diff --git a/game/scheduler/ObjectsScheduler.cpp b/game/scheduler/ObjectsScheduler.cpp index 11bb111..02d84c1 100644 --- a/game/scheduler/ObjectsScheduler.cpp +++ b/game/scheduler/ObjectsScheduler.cpp @@ -9,7 +9,6 @@ #include "api/Transform.h" #include "enemy/BattleScript.h" #include "prefab/ZapperPoolSubScene.h" -#include using namespace crepe; void ObjectsScheduler::preset_0() { trigger_event(MissileSpawnEvent {}); } @@ -20,13 +19,12 @@ void ObjectsScheduler::preset_4() {} void ObjectsScheduler::boss_fight_1() { this->get_components_by_name("camera").front().get().data.linear_velocity.x = 0; this->get_components_by_name("player").front().get().data.linear_velocity.x = 0; - - this->trigger_event(BattleStartEvent{.num_enemies = 5}); + this->trigger_event(BattleStartEvent{.num_enemies = 2}); } bool ObjectsScheduler::boss_fight_1_event() { - this->get_components_by_name("camera").front().get().data.linear_velocity.x = PLAYER_SPEED; - this->get_components_by_name("player").front().get().data.linear_velocity.x = PLAYER_SPEED; + this->get_components_by_name("camera").front().get().data.linear_velocity.x = PLAYER_SPEED * 0.02; + this->get_components_by_name("player").front().get().data.linear_velocity.x = PLAYER_SPEED * 0.02; return false; } diff --git a/game/scheduler/ObjectsScheduler.h b/game/scheduler/ObjectsScheduler.h index 1bd0940..56d72cb 100644 --- a/game/scheduler/ObjectsScheduler.h +++ b/game/scheduler/ObjectsScheduler.h @@ -15,8 +15,8 @@ private: int last_boss_check = 0; int last_obstacle_check = 0; - int boss_fight_interval = 1000; - int obstacle_interval = 3000; + int boss_fight_interval = 5000; + int obstacle_interval = 350; int start_offset = 1300; private: -- cgit v1.2.3