more WIP zapper

8 files changed, 164 insertions, 9 deletions

diff --git a/game/GameScene.cpp b/game/GameScene.cpp
index 57c6531..90a8b58 100644
--- a/game/GameScene.cpp
+++ b/game/GameScene.cpp
@@ -21,6 +21,7 @@
 
 #include "background/BackgroundSubScene.h"
 #include "prefab/PlayerObject.h"
+#include "prefab/ZapperObject.h"
 
 using namespace crepe;
 using namespace std;
@@ -40,7 +41,7 @@ void GameScene::load_scene() {
 	camera.add_component<BehaviorScript>().set_script<MoveCameraManualyScript>();
 	camera.add_component<Rigidbody>(Rigidbody::Data {});
 
-	PlayerObject player {new_object("player", "player", vec2(-100, 200))};
+	PlayerObject {new_object("player", "player", vec2(-100, 200))};
 
 	GameObject floor = new_object("floor", "game_world", vec2(0, 325));
 	floor.add_component<Rigidbody>(Rigidbody::Data {
@@ -66,6 +67,8 @@ void GameScene::load_scene() {
 	});
 	ceiling.add_component<BoxCollider>(vec2(INFINITY, 200));
 
+	ZapperObject {new_object("zapper", "zapper", vec2(800, 0))};
+
 	GameObject start_game_script = new_object("start_game_script", "script", vec2(0, 0));
 	start_game_script.add_component<BehaviorScript>().set_script<StartGameScript>();
 }
diff --git a/game/StartGameScript.cpp b/game/StartGameScript.cpp
index 50ba86c..1196d47 100644
--- a/game/StartGameScript.cpp
+++ b/game/StartGameScript.cpp
@@ -40,7 +40,7 @@ void StartGameScript::fixed_update(crepe::duration_t dt) {
 	if (player_transform.position.x > 275 && !this->took_jetpack) {
 		Animator & jetpack_stand_anim
 			= this->get_components_by_name<Animator>("start_begin").back();
-		jetpack_stand_anim.next_anim();
+		// jetpack_stand_anim.next_anim();
 		Sprite & jetpack_sprite = this->get_components_by_name<Sprite>("player").back();
 		jetpack_sprite.active = true;
 
diff --git a/game/background/HallwaySubScene.cpp b/game/background/HallwaySubScene.cpp
index 4d96c94..9a6654a 100644
--- a/game/background/HallwaySubScene.cpp
+++ b/game/background/HallwaySubScene.cpp
@@ -153,11 +153,6 @@ void HallwaySubScene::add_sector_number(
 	Animator & sector_num_anim = obj.add_component<Animator>(
 		sector_num_sprite, ivec2(256, 128), uvec2(4, 4), Animator::Data {}
 	);
-	int column = (sector_num - 1) / 4;
-	int row = (sector_num - 1) % 4;
-	sector_num_anim.set_anim(column);
-	for (int i = 0; i < row; i++) {
-		sector_num_anim.next_anim();
-	}
+	sector_num_anim.data.frame++;
 	sector_num_anim.pause();
 }
diff --git a/game/prefab/CMakeLists.txt b/game/prefab/CMakeLists.txt
index a588090..03084e4 100644
--- a/game/prefab/CMakeLists.txt
+++ b/game/prefab/CMakeLists.txt
@@ -1,5 +1,7 @@
 target_sources(main PUBLIC
 	PlayerObject.cpp
 	PlayerScript.cpp
+	ZapperObject.cpp
+	ZapperScript.cpp
 )
 
diff --git a/game/prefab/ZapperObject.cpp b/game/prefab/ZapperObject.cpp
new file mode 100644
index 0000000..2791162
--- /dev/null
+++ b/game/prefab/ZapperObject.cpp
@@ -0,0 +1,84 @@
+#include "Config.h"
+#include "ZapperObject.h"
+#include "ZapperScript.h"
+
+using namespace crepe;
+
+ZapperObject::ZapperObject(crepe::GameObject && base)
+	: GameObject(std::move(base)),
+	  sprite {
+		  .orb_start = add_component<Sprite>(
+			  Asset {"asset/obstacles/zapper/orbAnim.png"},
+			  Sprite::Data {
+				  .sorting_in_layer = SORT_IN_LAY_OBSTACLES,
+					.order_in_layer = 1,
+				  .size = vec2{0, 1} * SCALE,
+					.position_offset = {0, 100},
+			  }
+		  ),
+		  .orb_end = add_component<Sprite>(
+				sprite.orb_start.source,
+				Sprite::Data {
+					.flip = {true, true},
+					.sorting_in_layer = SORT_IN_LAY_OBSTACLES,
+					.order_in_layer = 1,
+				  .size = vec2{0, 1} * SCALE,
+					.position_offset = {0, -100},
+				}
+		  ),
+		  .glow_start = add_component<Sprite>(
+			  Asset {"asset/obstacles/zapper/regular_zappers/glow.png"},
+			  Sprite::Data {
+				  .sorting_in_layer = SORT_IN_LAY_OBSTACLES,
+					.order_in_layer = -1,
+				  .size = vec2{2, 2} * SCALE,
+					.position_offset = {0, 100},
+			  }
+		  ),
+		  .glow_end = add_component<Sprite>(
+				sprite.glow_start.source,
+				Sprite::Data {
+					.flip = {true, true},
+					.sorting_in_layer = SORT_IN_LAY_OBSTACLES,
+					.order_in_layer = -1,
+				  .size = vec2{2, 2} * SCALE,
+					.position_offset = {0, -100},
+				}
+		  ),
+			.beam = add_component<Sprite>(
+			  Asset {"asset/obstacles/zapper/regular_zappers/zapEffect.png"},
+			  Sprite::Data {
+				  .sorting_in_layer = SORT_IN_LAY_OBSTACLES,
+					.order_in_layer = 0,
+				  .size = vec2{200, 50},
+					.angle_offset = 90,
+			  }
+			),
+	  },
+	  animator {
+			.orb_start = add_component<Animator>(
+			  sprite.orb_start, ivec2(62, 42), uvec2(4, 1),
+			  Animator::Data {
+				  .fps = 10,
+				  .looping = true,
+			  }
+			),
+			.orb_end = add_component<Animator>(
+				sprite.orb_end, ivec2(62, 42), uvec2(4, 1),
+				animator.orb_start.data
+			),
+			.glow_start = add_component<Animator>(
+				sprite.glow_start, ivec2(128, 128), uvec2(4, 4),
+				Animator::Data {
+					.fps = 30,
+					.looping = true,
+				}
+			),
+			.glow_end = add_component<Animator>(
+				sprite.glow_end, ivec2(128, 128), uvec2(4, 4),
+				animator.glow_start.data
+			),
+	  },
+	  controller(add_component<BehaviorScript>().set_script<ZapperScript>(*this))
+{ }
+
diff --git a/game/prefab/ZapperObject.h b/game/prefab/ZapperObject.h
index 1f32cd7..6b68146 100644
--- a/game/prefab/ZapperObject.h
+++ b/game/prefab/ZapperObject.h
@@ -1,7 +1,37 @@
 #pragma once
 
+#include <crepe/api/Animator.h>
+#include <crepe/api/BehaviorScript.h>
+#include <crepe/api/BoxCollider.h>
 #include <crepe/api/GameObject.h>
+#include <crepe/api/Rigidbody.h>
+#include <crepe/api/Sprite.h>
 
 class ZapperObject : public crepe::GameObject {
-	// afsd
+public:
+	ZapperObject(crepe::GameObject &&);
+
+public:
+	struct {
+		crepe::Sprite & orb_start;
+		crepe::Sprite & orb_end;
+		crepe::Sprite & glow_start;
+		crepe::Sprite & glow_end;
+		crepe::Sprite & beam;
+	} sprite;
+
+	struct {
+		crepe::Animator & orb_start;
+		crepe::Animator & orb_end;
+		crepe::Animator & glow_start;
+		crepe::Animator & glow_end;
+	} animator;
+
+	// crepe::Rigidbody & body;
+	// crepe::BoxCollider & collider;
+	crepe::BehaviorScript & controller;
+
+private:
+	static constexpr int SCALE = 60;
 };
+
diff --git a/game/prefab/ZapperScript.cpp b/game/prefab/ZapperScript.cpp
new file mode 100644
index 0000000..b9b24be
--- /dev/null
+++ b/game/prefab/ZapperScript.cpp
@@ -0,0 +1,23 @@
+#include <crepe/api/Rigidbody.h>
+#include <cassert>
+
+#include "ZapperScript.h"
+
+using namespace crepe;
+using namespace std;
+
+ZapperScript::ZapperScript(const ZapperObject & zapper) : zapper(zapper) { }
+
+void ZapperScript::init() {
+	zapper.sprite.beam.mask = {
+		.w = 350,
+		.h = 117,
+		.x = 0,
+		.y = 0,
+	};
+}
+
+void ZapperScript::frame_update(duration_t delta_time) {
+	zapper.sprite.beam.mask.x += 4;
+}
+
diff --git a/game/prefab/ZapperScript.h b/game/prefab/ZapperScript.h
new file mode 100644
index 0000000..5a960df
--- /dev/null
+++ b/game/prefab/ZapperScript.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <crepe/api/Script.h>
+
+#include "ZapperObject.h"
+
+class ZapperScript : public crepe::Script {
+public:
+	ZapperScript(const ZapperObject & zapper);
+
+protected:
+	void init();
+	void frame_update(crepe::duration_t delta_time);
+
+protected:
+	ZapperObject zapper;
+};
+