From f6d1aa2fe104323b17ef3ed56e33651c67b3febe Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Wed, 8 Jan 2025 12:59:26 +0100
Subject: added replay functionality

---
 game/CMakeLists.txt                     |  1 +
 game/menus/ButtonReplaySubScript.cpp    | 31 +++++++++++++++++++++++++++++++
 game/menus/ButtonReplaySubScript.h      | 17 +++++++++++++++++
 game/menus/ButtonSubScene.cpp           |  5 +++++
 game/menus/ButtonSubScene.h             |  1 +
 game/menus/endgame/EndGameSubScene.cpp  |  2 +-
 game/menus/endgame/EndGameSubScript.cpp |  1 +
 7 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 game/menus/ButtonReplaySubScript.cpp
 create mode 100644 game/menus/ButtonReplaySubScript.h

diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index 4e31f80..1f9b8cf 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -33,6 +33,7 @@ add_executable(main
 	menus/IButtonScript.cpp
 	menus/ButtonSetShopSubScript.cpp
 	menus/ButtonSetMainMenuSubScript.cpp
+	menus/ButtonReplaySubScript.cpp
 	menus/ButtonNextMainMenuSubScript.cpp
 	menus/FloatingWindowSubScene.cpp
 	menus/IFloatingWindowScript.cpp
diff --git a/game/menus/ButtonReplaySubScript.cpp b/game/menus/ButtonReplaySubScript.cpp
new file mode 100644
index 0000000..26cb8ee
--- /dev/null
+++ b/game/menus/ButtonReplaySubScript.cpp
@@ -0,0 +1,31 @@
+#include "ButtonReplaySubScript.h"
+#include "MenusConfig.h"
+
+#include <crepe/api/AudioSource.h>
+#include <crepe/types.h>
+#include "../Events.h"
+
+using namespace crepe;
+using namespace std;
+
+void ButtonReplaySubScript::init() {
+	IButtonScript::init();
+	this->subscribe<ButtonPressEvent>([this](const ButtonPressEvent & e) {
+		return this->on_button_press(e);
+	});
+	this->subscribe<EndGameEvent>([this](const EndGameEvent & e) {
+		return this->set_recording();
+	});
+	replay.record_start();
+}
+
+
+bool ButtonReplaySubScript::on_button_press(const ButtonPressEvent & e) {
+	replay.play(this->recording);
+	return false;
+}
+
+bool ButtonReplaySubScript::set_recording(){
+	this->recording = replay.record_end();
+	return false;
+}
diff --git a/game/menus/ButtonReplaySubScript.h b/game/menus/ButtonReplaySubScript.h
new file mode 100644
index 0000000..7e63d06
--- /dev/null
+++ b/game/menus/ButtonReplaySubScript.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "IButtonScript.h"
+
+#include <crepe/api/Script.h>
+
+class ButtonReplaySubScript : public IButtonScript {
+public:
+	void init() override;
+	bool on_button_press(const crepe::ButtonPressEvent & e);
+private:
+	crepe::recording_t recording = 0;
+	bool set_recording();
+
+protected:
+	bool transition = false;
+};
diff --git a/game/menus/ButtonSubScene.cpp b/game/menus/ButtonSubScene.cpp
index e41c798..2fb4c38 100644
--- a/game/menus/ButtonSubScene.cpp
+++ b/game/menus/ButtonSubScene.cpp
@@ -1,5 +1,6 @@
 #include "ButtonSubScene.h"
 #include "ButtonNextMainMenuSubScript.h"
+#include "ButtonReplaySubScript.h"
 #include "ButtonSetMainMenuSubScript.h"
 #include "ButtonSetShopSubScript.h"
 #include "IButtonScript.h"
@@ -58,6 +59,10 @@ void ButtonSubScene::set_script(crepe::GameObject & button_object, const Data &
 			button_object.add_component<BehaviorScript>()
 				.set_script<ButtonNextMainMenuSubScript>();
 			break;
+		case ScriptSelect::REPLAY:
+			button_object.add_component<BehaviorScript>()
+				.set_script<ButtonReplaySubScript>();
+			break;
 		case ScriptSelect::NONE:
 			button_object.add_component<BehaviorScript>().set_script<IButtonScript>();
 			break;
diff --git a/game/menus/ButtonSubScene.h b/game/menus/ButtonSubScene.h
index c1c6de8..ba6d1f7 100644
--- a/game/menus/ButtonSubScene.h
+++ b/game/menus/ButtonSubScene.h
@@ -16,6 +16,7 @@ public:
 		SHOP,
 		MAINMENU,
 		NEXT,
+		REPLAY,
 		NONE,
 	};
 	//icon enum
diff --git a/game/menus/endgame/EndGameSubScene.cpp b/game/menus/endgame/EndGameSubScene.cpp
index 3ef0f9a..a6f8b25 100644
--- a/game/menus/endgame/EndGameSubScene.cpp
+++ b/game/menus/endgame/EndGameSubScene.cpp
@@ -71,7 +71,7 @@ void EndGameSubScene::create(Scene & scn) {
 			.text = "REPLAY",
 			.text_width = 150,
 			.position = {-button_position.x, button_position.y},
-			// .script_type = ButtonSubScene::ScriptSelect::MAINMENU,
+			.script_type = ButtonSubScene::ScriptSelect::REPLAY,
 			.button_type = ButtonSubScene::ButtonSelect::BACK,
 			.scale = 0.6,
 			.worldspace = false,
diff --git a/game/menus/endgame/EndGameSubScript.cpp b/game/menus/endgame/EndGameSubScript.cpp
index f120e2d..08a9f8c 100644
--- a/game/menus/endgame/EndGameSubScript.cpp
+++ b/game/menus/endgame/EndGameSubScript.cpp
@@ -2,6 +2,7 @@
 
 #include "../../Events.h"
 #include "../IFloatingWindowScript.h"
+#include "../ButtonReplaySubScript.h"
 
 #include <string>
 
-- 
cgit v1.2.3


From 1ef80ecfdc1a70a6ebdd43fed82d0f9d305d63dc Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 8 Jan 2025 13:07:31 +0100
Subject: implement animator replay

---
 src/crepe/api/Animator.cpp | 17 ++++++++++++++++-
 src/crepe/api/Animator.h   |  6 ++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp
index c558d86..f9a283e 100644
--- a/src/crepe/api/Animator.cpp
+++ b/src/crepe/api/Animator.cpp
@@ -1,4 +1,3 @@
-
 #include "util/dbg.h"
 
 #include "Animator.h"
@@ -6,6 +5,7 @@
 #include "Sprite.h"
 
 using namespace crepe;
+using namespace std;
 
 Animator::Animator(
 	game_object_id_t id, Sprite & spritesheet, const ivec2 & single_frame_size,
@@ -57,3 +57,18 @@ void Animator::next_anim() {
 	ctx.row = ++ctx.row % this->grid_size.x;
 	this->spritesheet.mask.x = ctx.row * this->spritesheet.mask.w;
 }
+
+unique_ptr<Component> Animator::save() const {
+	return unique_ptr<Component>(new Animator(*this));
+}
+
+void Animator::restore(const Component & snapshot) {
+	*this = static_cast<const Animator &>(snapshot);
+}
+
+Animator & Animator::operator=(const Animator & snapshot) {
+	this->data = snapshot.data;
+	this->elapsed_time = snapshot.elapsed_time;
+	this->frame = snapshot.frame;
+	return *this;
+}
diff --git a/src/crepe/api/Animator.h b/src/crepe/api/Animator.h
index 95539d3..d1f49c4 100644
--- a/src/crepe/api/Animator.h
+++ b/src/crepe/api/Animator.h
@@ -108,6 +108,12 @@ private:
 
 	//! Uses the spritesheet
 	friend AnimatorSystem;
+
+protected:
+	virtual std::unique_ptr<Component> save() const;
+	Animator(const Animator &) = default;
+	virtual void restore(const Component & snapshot);
+	virtual Animator & operator=(const Animator &);
 };
 
 } // namespace crepe
-- 
cgit v1.2.3


From 4d5a1570908d47b8f2d3bfa65634f2fb2dcf7e3c Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 8 Jan 2025 13:10:03 +0100
Subject: Revert "implement animator replay"

This reverts commit 1ef80ecfdc1a70a6ebdd43fed82d0f9d305d63dc.
---
 src/crepe/api/Animator.cpp | 17 +----------------
 src/crepe/api/Animator.h   |  6 ------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/crepe/api/Animator.cpp b/src/crepe/api/Animator.cpp
index f9a283e..c558d86 100644
--- a/src/crepe/api/Animator.cpp
+++ b/src/crepe/api/Animator.cpp
@@ -1,3 +1,4 @@
+
 #include "util/dbg.h"
 
 #include "Animator.h"
@@ -5,7 +6,6 @@
 #include "Sprite.h"
 
 using namespace crepe;
-using namespace std;
 
 Animator::Animator(
 	game_object_id_t id, Sprite & spritesheet, const ivec2 & single_frame_size,
@@ -57,18 +57,3 @@ void Animator::next_anim() {
 	ctx.row = ++ctx.row % this->grid_size.x;
 	this->spritesheet.mask.x = ctx.row * this->spritesheet.mask.w;
 }
-
-unique_ptr<Component> Animator::save() const {
-	return unique_ptr<Component>(new Animator(*this));
-}
-
-void Animator::restore(const Component & snapshot) {
-	*this = static_cast<const Animator &>(snapshot);
-}
-
-Animator & Animator::operator=(const Animator & snapshot) {
-	this->data = snapshot.data;
-	this->elapsed_time = snapshot.elapsed_time;
-	this->frame = snapshot.frame;
-	return *this;
-}
diff --git a/src/crepe/api/Animator.h b/src/crepe/api/Animator.h
index d1f49c4..95539d3 100644
--- a/src/crepe/api/Animator.h
+++ b/src/crepe/api/Animator.h
@@ -108,12 +108,6 @@ private:
 
 	//! Uses the spritesheet
 	friend AnimatorSystem;
-
-protected:
-	virtual std::unique_ptr<Component> save() const;
-	Animator(const Animator &) = default;
-	virtual void restore(const Component & snapshot);
-	virtual Animator & operator=(const Animator &);
 };
 
 } // namespace crepe
-- 
cgit v1.2.3


From 8ea70b897805ff84113758d45a4c5c1a171a77bd Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 8 Jan 2025 13:14:37 +0100
Subject: implement sprite replay

---
 src/crepe/api/Sprite.cpp | 15 +++++++++++++++
 src/crepe/api/Sprite.h   | 10 ++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp
index 0107c7b..2919857 100644
--- a/src/crepe/api/Sprite.cpp
+++ b/src/crepe/api/Sprite.cpp
@@ -19,3 +19,18 @@ Sprite::Sprite(game_object_id_t id, const Asset & texture, const Sprite::Data &
 }
 
 Sprite::~Sprite() { dbg_trace(); }
+
+unique_ptr<Component> Sprite::save() const {
+	return unique_ptr<Component>(new Sprite(*this));
+}
+
+void Sprite::restore(const Component & snapshot) {
+	*this = static_cast<const Sprite &>(snapshot);
+}
+
+Sprite & Sprite::operator=(const Sprite & snapshot) {
+	this->active = snapshot.active;
+	this->data = snapshot.data;
+	this->mask = snapshot.mask;
+	return *this;
+}
diff --git a/src/crepe/api/Sprite.h b/src/crepe/api/Sprite.h
index a3fc319..3565bed 100644
--- a/src/crepe/api/Sprite.h
+++ b/src/crepe/api/Sprite.h
@@ -42,10 +42,10 @@ public:
 		FlipSettings flip;
 
 		//! Layer sorting level of the sprite
-		const int sorting_in_layer = 0;
+		int sorting_in_layer = 0;
 
 		//! Order within the sorting layer
-		const int order_in_layer = 0;
+		int order_in_layer = 0;
 
 		/**
 		 * \brief width and height of the sprite in game units
@@ -119,6 +119,12 @@ private:
 	//! Render area of the sprite this will also be adjusted by the AnimatorSystem if an Animator
 	// object is present in GameObject. this is in sprite pixels
 	Rect mask;
+
+protected:
+	virtual std::unique_ptr<Component> save() const;
+	Sprite(const Sprite &) = default;
+	virtual void restore(const Component & snapshot);
+	virtual Sprite & operator=(const Sprite &);
 };
 
 } // namespace crepe
-- 
cgit v1.2.3


From aa8bf26452157f81f72b6d6759e461ff2ca24568 Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Wed, 8 Jan 2025 13:40:20 +0100
Subject: updated preview and added credits button

---
 game/hud/SpeedScript.cpp                 |  2 +
 game/hud/SpeedScript.h                   |  2 +-
 game/menus/mainmenu/CreditsSubScene.cpp  | 68 ++++++++++++++++++++++++++++++++
 game/menus/mainmenu/CreditsSubScene.h    |  9 +++++
 game/menus/mainmenu/CreditsSubScript.cpp | 46 +++++++++++++++++++++
 game/menus/mainmenu/CreditsSubScript.h   | 14 +++++++
 game/menus/mainmenu/MainMenuScene.cpp    | 15 ++++++-
 7 files changed, 154 insertions(+), 2 deletions(-)
 create mode 100644 game/menus/mainmenu/CreditsSubScene.cpp
 create mode 100644 game/menus/mainmenu/CreditsSubScene.h
 create mode 100644 game/menus/mainmenu/CreditsSubScript.cpp
 create mode 100644 game/menus/mainmenu/CreditsSubScript.h

diff --git a/game/hud/SpeedScript.cpp b/game/hud/SpeedScript.cpp
index d0a4dfe..29d4193 100644
--- a/game/hud/SpeedScript.cpp
+++ b/game/hud/SpeedScript.cpp
@@ -26,9 +26,11 @@ void SpeedScript::init() {
 void SpeedScript::fixed_update(crepe::duration_t dt) {
 	LoopTimerManager & lp = this->get_loop_timer();
 	if (this->get_key_state(Keycode::PAGE_UP)) {
+		if(lp.get_time_scale() >= 2) return;
 		lp.set_time_scale(lp.get_time_scale() + 0.1);
 	}
 	if (this->get_key_state(Keycode::PAGE_DOWN)) {
+		if(lp.get_time_scale() <= 0.5) return;
 		lp.set_time_scale(lp.get_time_scale() - 0.1);
 	}
 }
diff --git a/game/hud/SpeedScript.h b/game/hud/SpeedScript.h
index 6c15a89..b40f7cc 100644
--- a/game/hud/SpeedScript.h
+++ b/game/hud/SpeedScript.h
@@ -10,6 +10,6 @@ public:
 
 private:
 	crepe::SaveManager * savemgr;
-	bool toggle = true;
+	bool toggle = false;
 	float timescale = 1;
 };
diff --git a/game/menus/mainmenu/CreditsSubScene.cpp b/game/menus/mainmenu/CreditsSubScene.cpp
new file mode 100644
index 0000000..9a49257
--- /dev/null
+++ b/game/menus/mainmenu/CreditsSubScene.cpp
@@ -0,0 +1,68 @@
+
+#include "CreditsSubScene.h"
+#include "CreditsSubScript.h"
+#include "EndGameSubScript.h"
+
+#include "../../Config.h"
+#include "../ButtonSubScene.h"
+#include "../FloatingWindowSubScene.h"
+
+#include <string>
+
+#include <crepe/api/BehaviorScript.h>
+#include <crepe/api/GameObject.h>
+#include <crepe/api/Text.h>
+#include <crepe/types.h>
+
+using namespace crepe;
+using namespace std;
+
+void CreditsSubScene::create(Scene & scn) {
+
+	const std::string TAG = "end_game_tag";
+	GameObject script = scn.new_object("script");
+	script.add_component<BehaviorScript>().set_script<CreditsSubScript>(TAG);
+
+	// Window
+	FloatingWindowSubScene window;
+	window.create(
+		scn,
+		FloatingWindowSubScene::Data {
+			.group_tag = TAG,
+			.width = 500,
+			.offset = {0, -50},
+			.width_middle_offset = -2,
+		}
+	);
+
+	// Titel
+	const string TITEL_STRING = "Credits";
+	GameObject titel = scn.new_object("titel", TAG);
+	crepe::vec2 size = {200, (200.0f / TITEL_STRING.size()) * 2};
+	titel.add_component<Text>(
+		size, FONT,
+		Text::Data {
+			.world_space = false,
+			.text_color = Color::WHITE,
+		},
+		vec2 {0, -207} + FONTOFFSET, TITEL_STRING
+	);
+
+	// Buttons
+	vec2 button_position = {190, 190};
+	ButtonSubScene button;
+	button.create(
+		scn,
+		ButtonSubScene::Data {
+			.text = "Back",
+			.text_width = 150,
+			.position = {-button_position.x, button_position.y},
+			//.script_type = ButtonSubScene::ScriptSelect::REPLAY,
+			//.button_type = ButtonSubScene::ButtonSelect::BACK,
+			.scale = 0.6,
+			.worldspace = false,
+			.tag = TAG,
+			.sorting_layer_offset = 20,
+		}
+	);
+}
diff --git a/game/menus/mainmenu/CreditsSubScene.h b/game/menus/mainmenu/CreditsSubScene.h
new file mode 100644
index 0000000..e7ff735
--- /dev/null
+++ b/game/menus/mainmenu/CreditsSubScene.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#include <crepe/api/Scene.h>
+
+class CreditsSubScene {
+
+public:
+	void create(crepe::Scene & scn);
+};
diff --git a/game/menus/mainmenu/CreditsSubScript.cpp b/game/menus/mainmenu/CreditsSubScript.cpp
new file mode 100644
index 0000000..5326594
--- /dev/null
+++ b/game/menus/mainmenu/CreditsSubScript.cpp
@@ -0,0 +1,46 @@
+#include "CreditsSubScript.h"
+
+#include "../../Events.h"
+#include "../IFloatingWindowScript.h"
+#include "../ButtonReplaySubScript.h"
+
+#include <string>
+
+#include <crepe/api/Button.h>
+#include <crepe/api/Sprite.h>
+#include <crepe/api/Text.h>
+#include <crepe/types.h>
+
+using namespace crepe;
+
+CreditsSubScript::CreditsSubScript(const std::string & tag) { this->tag = tag; }
+
+void CreditsSubScript::init() {
+	this->disable_all();
+}
+
+bool CreditsSubScript::disable_all() {
+	IFloatingWindowScript::disable_all_sprites();
+	RefVector<Button> buttons = this->get_components_by_tag<Button>(this->tag);
+	for (Button & button : buttons) {
+		button.active = false;
+	}
+	RefVector<Text> texts = this->get_components_by_tag<Text>(this->tag);
+	for (Text & text : texts) {
+		text.active = false;
+	}
+	return false;
+}
+
+bool CreditsSubScript::enable_all() {
+	IFloatingWindowScript::enable_all_sprites();
+	RefVector<Button> buttons = this->get_components_by_tag<Button>(this->tag);
+	for (Button & button : buttons) {
+		button.active = true;
+	}
+	RefVector<Text> texts = this->get_components_by_tag<Text>(this->tag);
+	for (Text & text : texts) {
+		text.active = true;
+	}
+	return false;
+}
diff --git a/game/menus/mainmenu/CreditsSubScript.h b/game/menus/mainmenu/CreditsSubScript.h
new file mode 100644
index 0000000..08e1f91
--- /dev/null
+++ b/game/menus/mainmenu/CreditsSubScript.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "../IFloatingWindowScript.h"
+
+#include <crepe/api/Event.h>
+#include <crepe/api/Script.h>
+
+class CreditsSubScript : public IFloatingWindowScript {
+public:
+	CreditsSubScript(const std::string & tag);
+	void init() override;
+	bool disable_all();
+	bool enable_all();
+};
diff --git a/game/menus/mainmenu/MainMenuScene.cpp b/game/menus/mainmenu/MainMenuScene.cpp
index 43418e3..743fe43 100644
--- a/game/menus/mainmenu/MainMenuScene.cpp
+++ b/game/menus/mainmenu/MainMenuScene.cpp
@@ -64,7 +64,7 @@ void MainMenuScene::load_scene() {
 		ButtonSubScene::Data {
 			.text = "SHOP",
 			.text_offset = {-20, 0},
-			.text_width = 115,
+			.text_width = 110,
 			.icon_offset = {60, 0},
 			.icon_type = ButtonSubScene::IconSelect::SHOP,
 			.position = pos_btn,
@@ -72,6 +72,19 @@ void MainMenuScene::load_scene() {
 		}
 	);
 
+	//Credits btn
+	pos_btn.y += MENU_BUTTON_SPACING + LARGE_OVERLAY_SIZE.y;
+	button.create(
+		*this,
+		ButtonSubScene::Data {
+			.text = "CREDITS",
+			.text_offset = {0, 0},
+			.text_width = 200,
+			.position = pos_btn,
+			//.script_type = ButtonSubScene::ScriptSelect::SHOP,
+		}
+	);
+
 	//Start of map
 	StartSubScene start;
 	HallwaySubScene hallway;
-- 
cgit v1.2.3


From 3b6081d03300d353434fd4f6e91237fc8f1a4390 Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Wed, 8 Jan 2025 14:40:37 +0100
Subject: added credit window

---
 game/CMakeLists.txt                       |  3 +++
 game/menus/ButtonShowCreditsSubScript.cpp | 20 ++++++++++++++++++++
 game/menus/ButtonShowCreditsSubScript.h   | 14 ++++++++++++++
 game/menus/ButtonSubScene.cpp             | 10 ++++++++++
 game/menus/ButtonSubScene.h               |  2 ++
 game/menus/mainmenu/CreditsSubScene.cpp   | 13 ++++++-------
 game/menus/mainmenu/CreditsSubScript.cpp  | 14 ++++++++++++++
 game/menus/mainmenu/CreditsSubScript.h    |  6 +++++-
 game/menus/mainmenu/MainMenuScene.cpp     |  6 +++++-
 9 files changed, 79 insertions(+), 9 deletions(-)
 create mode 100644 game/menus/ButtonShowCreditsSubScript.cpp
 create mode 100644 game/menus/ButtonShowCreditsSubScript.h

diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index 1f9b8cf..f81850d 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -37,11 +37,14 @@ add_executable(main
 	menus/ButtonNextMainMenuSubScript.cpp
 	menus/FloatingWindowSubScene.cpp
 	menus/IFloatingWindowScript.cpp
+	menus/ButtonShowCreditsSubScript.cpp
 	menus/shop/ShopMenuScene.cpp
 	menus/mainmenu/ButtonTransitionPreviewSubScript.cpp
 	menus/mainmenu/ITransitionScript.cpp
 	menus/mainmenu/MainMenuScene.cpp
 	menus/mainmenu/TransitionStartSubScript.cpp
+	menus/mainmenu/CreditsSubScene.cpp
+	menus/mainmenu/CreditsSubScript.cpp
 	menus/endgame/EndGameSubScene.cpp
 	menus/endgame/EndGameSubScript.cpp
 	coins/CoinSubScene.cpp
diff --git a/game/menus/ButtonShowCreditsSubScript.cpp b/game/menus/ButtonShowCreditsSubScript.cpp
new file mode 100644
index 0000000..ec0e980
--- /dev/null
+++ b/game/menus/ButtonShowCreditsSubScript.cpp
@@ -0,0 +1,20 @@
+#include "ButtonShowCreditsSubScript.h"
+#include "MenusConfig.h"
+#include "mainmenu/CreditsSubScript.h"
+#include <crepe/api/AudioSource.h>
+#include <crepe/types.h>
+
+using namespace crepe;
+using namespace std;
+
+void ButtonShowCreditsSubScript::init() {
+	IButtonScript::init();
+	this->subscribe<ButtonPressEvent>([this](const ButtonPressEvent & e) {
+		return this->on_button_press(e);
+	});
+}
+
+bool ButtonShowCreditsSubScript::on_button_press(const ButtonPressEvent & e) {
+	this->trigger_event<ShowCreditsEvent>();
+	return false;
+}
diff --git a/game/menus/ButtonShowCreditsSubScript.h b/game/menus/ButtonShowCreditsSubScript.h
new file mode 100644
index 0000000..3c73c44
--- /dev/null
+++ b/game/menus/ButtonShowCreditsSubScript.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "IButtonScript.h"
+
+#include <crepe/api/Script.h>
+
+class ButtonShowCreditsSubScript : public IButtonScript {
+public:
+	void init() override;
+	bool on_button_press(const crepe::ButtonPressEvent & e);
+
+protected:
+	bool transition = false;
+};
diff --git a/game/menus/ButtonSubScene.cpp b/game/menus/ButtonSubScene.cpp
index 2fb4c38..d657be9 100644
--- a/game/menus/ButtonSubScene.cpp
+++ b/game/menus/ButtonSubScene.cpp
@@ -3,12 +3,14 @@
 #include "ButtonReplaySubScript.h"
 #include "ButtonSetMainMenuSubScript.h"
 #include "ButtonSetShopSubScript.h"
+#include "ButtonShowCreditsSubScript.h"
 #include "IButtonScript.h"
 #include "MenusConfig.h"
 
 #include "mainmenu/ButtonTransitionPreviewSubScript.h"
 
 #include "../Config.h"
+#include "mainmenu/CreditsSubScript.h"
 
 #include <crepe/api/BehaviorScript.h>
 #include <crepe/api/Button.h>
@@ -63,6 +65,14 @@ void ButtonSubScene::set_script(crepe::GameObject & button_object, const Data &
 			button_object.add_component<BehaviorScript>()
 				.set_script<ButtonReplaySubScript>();
 			break;
+		case ScriptSelect::CREDITS_BACK:
+			button_object.add_component<BehaviorScript>()
+				.set_script<CreditsSubScript>(data.tag);
+			break;
+		case ScriptSelect::CREDITS_SHOW:
+			button_object.add_component<BehaviorScript>()
+				.set_script<ButtonShowCreditsSubScript>();
+			break;
 		case ScriptSelect::NONE:
 			button_object.add_component<BehaviorScript>().set_script<IButtonScript>();
 			break;
diff --git a/game/menus/ButtonSubScene.h b/game/menus/ButtonSubScene.h
index ba6d1f7..74f9464 100644
--- a/game/menus/ButtonSubScene.h
+++ b/game/menus/ButtonSubScene.h
@@ -17,6 +17,8 @@ public:
 		MAINMENU,
 		NEXT,
 		REPLAY,
+		CREDITS_SHOW,
+		CREDITS_BACK,
 		NONE,
 	};
 	//icon enum
diff --git a/game/menus/mainmenu/CreditsSubScene.cpp b/game/menus/mainmenu/CreditsSubScene.cpp
index 9a49257..df4616e 100644
--- a/game/menus/mainmenu/CreditsSubScene.cpp
+++ b/game/menus/mainmenu/CreditsSubScene.cpp
@@ -1,7 +1,6 @@
 
 #include "CreditsSubScene.h"
 #include "CreditsSubScript.h"
-#include "EndGameSubScript.h"
 
 #include "../../Config.h"
 #include "../ButtonSubScene.h"
@@ -19,7 +18,7 @@ using namespace std;
 
 void CreditsSubScene::create(Scene & scn) {
 
-	const std::string TAG = "end_game_tag";
+	const std::string TAG = "credits_tag";
 	GameObject script = scn.new_object("script");
 	script.add_component<BehaviorScript>().set_script<CreditsSubScript>(TAG);
 
@@ -30,7 +29,7 @@ void CreditsSubScene::create(Scene & scn) {
 		FloatingWindowSubScene::Data {
 			.group_tag = TAG,
 			.width = 500,
-			.offset = {0, -50},
+			.offset = {150, -50},
 			.width_middle_offset = -2,
 		}
 	);
@@ -45,7 +44,7 @@ void CreditsSubScene::create(Scene & scn) {
 			.world_space = false,
 			.text_color = Color::WHITE,
 		},
-		vec2 {0, -207} + FONTOFFSET, TITEL_STRING
+		vec2 {150, -207} + FONTOFFSET, TITEL_STRING
 	);
 
 	// Buttons
@@ -56,9 +55,9 @@ void CreditsSubScene::create(Scene & scn) {
 		ButtonSubScene::Data {
 			.text = "Back",
 			.text_width = 150,
-			.position = {-button_position.x, button_position.y},
-			//.script_type = ButtonSubScene::ScriptSelect::REPLAY,
-			//.button_type = ButtonSubScene::ButtonSelect::BACK,
+			.position = {-button_position.x+150, button_position.y},
+			.script_type = ButtonSubScene::ScriptSelect::CREDITS_BACK,
+			.button_type = ButtonSubScene::ButtonSelect::BACK,
 			.scale = 0.6,
 			.worldspace = false,
 			.tag = TAG,
diff --git a/game/menus/mainmenu/CreditsSubScript.cpp b/game/menus/mainmenu/CreditsSubScript.cpp
index 5326594..ce74ba4 100644
--- a/game/menus/mainmenu/CreditsSubScript.cpp
+++ b/game/menus/mainmenu/CreditsSubScript.cpp
@@ -13,9 +13,18 @@
 
 using namespace crepe;
 
+
 CreditsSubScript::CreditsSubScript(const std::string & tag) { this->tag = tag; }
 
 void CreditsSubScript::init() {
+	IButtonScript::init();
+	this->subscribe<ButtonPressEvent>([this](const ButtonPressEvent & e) {
+		return this->on_button_press(e);
+	});
+	this->subscribe<ShowCreditsEvent>([this](const ShowCreditsEvent & e) {
+		this->enable_all();
+		return false;
+	});
 	this->disable_all();
 }
 
@@ -44,3 +53,8 @@ bool CreditsSubScript::enable_all() {
 	}
 	return false;
 }
+
+bool CreditsSubScript::on_button_press(const ButtonPressEvent & e) {
+	return this->disable_all();
+}
+
diff --git a/game/menus/mainmenu/CreditsSubScript.h b/game/menus/mainmenu/CreditsSubScript.h
index 08e1f91..e411202 100644
--- a/game/menus/mainmenu/CreditsSubScript.h
+++ b/game/menus/mainmenu/CreditsSubScript.h
@@ -1,14 +1,18 @@
 #pragma once
 
 #include "../IFloatingWindowScript.h"
+#include "../IButtonScript.h"
 
 #include <crepe/api/Event.h>
 #include <crepe/api/Script.h>
 
-class CreditsSubScript : public IFloatingWindowScript {
+struct ShowCreditsEvent : public crepe::Event {};
+
+class CreditsSubScript : public IFloatingWindowScript, public IButtonScript {
 public:
 	CreditsSubScript(const std::string & tag);
 	void init() override;
 	bool disable_all();
 	bool enable_all();
+	bool on_button_press(const crepe::ButtonPressEvent & e);
 };
diff --git a/game/menus/mainmenu/MainMenuScene.cpp b/game/menus/mainmenu/MainMenuScene.cpp
index 743fe43..fba90ac 100644
--- a/game/menus/mainmenu/MainMenuScene.cpp
+++ b/game/menus/mainmenu/MainMenuScene.cpp
@@ -1,5 +1,6 @@
 
 #include "MainMenuScene.h"
+#include "CreditsSubScene.h"
 #include "MainMenuConfig.h"
 #include "TransitionStartSubScript.h"
 
@@ -81,7 +82,7 @@ void MainMenuScene::load_scene() {
 			.text_offset = {0, 0},
 			.text_width = 200,
 			.position = pos_btn,
-			//.script_type = ButtonSubScene::ScriptSelect::SHOP,
+			.script_type = ButtonSubScene::ScriptSelect::CREDITS_SHOW,
 		}
 	);
 
@@ -123,6 +124,9 @@ void MainMenuScene::load_scene() {
 			.tag = MENU_INFO_TAG,
 		}
 	);
+
+	CreditsSubScene creditscene;
+	creditscene.create(*this);
 }
 
 string MainMenuScene::get_name() const { return MAINMENU_SCENE; }
-- 
cgit v1.2.3


From bff2e7d64d45d8e331da703cba0d74894cf32a84 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 8 Jan 2025 14:47:31 +0100
Subject: fix audio unit test

---
 src/test/AudioTest.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/test/AudioTest.cpp b/src/test/AudioTest.cpp
index 3844c73..e548221 100644
--- a/src/test/AudioTest.cpp
+++ b/src/test/AudioTest.cpp
@@ -60,6 +60,8 @@ TEST_F(AudioTest, Play) {
 		InSequence seq;
 
 		EXPECT_CALL(context, play(_)).Times(0);
+		EXPECT_CALL(context, set_loop(_, _)).Times(0);
+		EXPECT_CALL(context, set_volume(_, _)).Times(0);
 		component.play();
 	}
 
@@ -67,6 +69,8 @@ TEST_F(AudioTest, Play) {
 		InSequence seq;
 
 		EXPECT_CALL(context, play(_)).Times(1);
+		EXPECT_CALL(context, set_loop(_, _)).Times(1);
+		EXPECT_CALL(context, set_volume(_, _)).Times(1);
 		system.fixed_update();
 	}
 }
@@ -146,6 +150,9 @@ TEST_F(AudioTest, PlayOnActive) {
 		InSequence seq;
 
 		EXPECT_CALL(context, play(_)).Times(1);
+		EXPECT_CALL(context, set_loop(_, _)).Times(1);
+		EXPECT_CALL(context, set_volume(_, _)).Times(1);
+
 		component.active = true;
 		system.fixed_update();
 	}
@@ -156,6 +163,8 @@ TEST_F(AudioTest, PlayImmediately) {
 	component.play();
 
 	EXPECT_CALL(context, play(_)).Times(1);
+	EXPECT_CALL(context, set_volume(_, _)).Times(1);
+	EXPECT_CALL(context, set_loop(_, _)).Times(1);
 
 	system.fixed_update();
 }
-- 
cgit v1.2.3


From b92b3b830dc53ecc2accf8472a8e4ce8be2e19dc Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 8 Jan 2025 14:49:09 +0100
Subject: `make format`

---
 game/Random.cpp          | 1 -
 game/Random.h            | 2 --
 src/crepe/api/Sprite.cpp | 4 +---
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/game/Random.cpp b/game/Random.cpp
index 59be3c5..ace6245 100644
--- a/game/Random.cpp
+++ b/game/Random.cpp
@@ -25,4 +25,3 @@ unsigned Random::u(unsigned upper, unsigned lower) {
 	unsigned x = rand() % range;
 	return x + lower;
 }
-
diff --git a/game/Random.h b/game/Random.h
index cf05e87..8af9669 100644
--- a/game/Random.h
+++ b/game/Random.h
@@ -6,6 +6,4 @@ public:
 	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/src/crepe/api/Sprite.cpp b/src/crepe/api/Sprite.cpp
index 2919857..3c77e2e 100644
--- a/src/crepe/api/Sprite.cpp
+++ b/src/crepe/api/Sprite.cpp
@@ -20,9 +20,7 @@ Sprite::Sprite(game_object_id_t id, const Asset & texture, const Sprite::Data &
 
 Sprite::~Sprite() { dbg_trace(); }
 
-unique_ptr<Component> Sprite::save() const {
-	return unique_ptr<Component>(new Sprite(*this));
-}
+unique_ptr<Component> Sprite::save() const { return unique_ptr<Component>(new Sprite(*this)); }
 
 void Sprite::restore(const Component & snapshot) {
 	*this = static_cast<const Sprite &>(snapshot);
-- 
cgit v1.2.3


From 1dbf6855eb8fcafb411c92257cd10af13e3562f1 Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Wed, 8 Jan 2025 14:58:54 +0100
Subject: filled credits

---
 game/menus/mainmenu/CreditsSubScene.cpp | 59 +++++++++++++++++++++++++++++++++
 game/menus/shop/ShopMenuScene.cpp       |  2 ++
 2 files changed, 61 insertions(+)

diff --git a/game/menus/mainmenu/CreditsSubScene.cpp b/game/menus/mainmenu/CreditsSubScene.cpp
index df4616e..bdd6fa0 100644
--- a/game/menus/mainmenu/CreditsSubScene.cpp
+++ b/game/menus/mainmenu/CreditsSubScene.cpp
@@ -64,4 +64,63 @@ void CreditsSubScene::create(Scene & scn) {
 			.sorting_layer_offset = 20,
 		}
 	);
+
+	const float SIZE_CHAR_NAMES = 10;
+	const float Y_OFFSET_NAMES_BEGIN = 100;
+	const float Y_OFFSET_NAMES = 30;
+	const string LOEK = "Loek Le Blansch";
+	crepe::vec2 size_loek = {LOEK.size()*SIZE_CHAR_NAMES, (LOEK.size()*SIZE_CHAR_NAMES / LOEK.size()) * 2};
+	titel.add_component<Text>(
+		size_loek, FONT,
+		Text::Data {
+			.world_space = false,
+			.text_color = Color::WHITE,
+		},
+		vec2 {150, -207+Y_OFFSET_NAMES+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, LOEK
+	);
+
+	const string WOUTER = "Wouter Boerenkamps";
+	crepe::vec2 size_wouter = {WOUTER.size()*SIZE_CHAR_NAMES, (WOUTER.size()*SIZE_CHAR_NAMES / WOUTER.size()) * 2};
+	titel.add_component<Text>(
+		size_wouter, FONT,
+		Text::Data {
+			.world_space = false,
+			.text_color = Color::WHITE,
+		},
+		vec2 {150, -207+Y_OFFSET_NAMES*2+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, WOUTER
+	);
+
+	const string JARO = "Jaro Rutjes";
+	crepe::vec2 size_jaro = {JARO.size()*SIZE_CHAR_NAMES, (JARO.size()*SIZE_CHAR_NAMES / JARO.size()) * 2};
+	titel.add_component<Text>(
+		size_jaro, FONT,
+		Text::Data {
+			.world_space = false,
+			.text_color = Color::WHITE,
+		},
+		vec2 {150, -207+Y_OFFSET_NAMES*3+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, JARO
+	);
+
+	const string MAX = "Max Smits";
+	crepe::vec2 size_max = {MAX.size()*SIZE_CHAR_NAMES, (MAX.size()*SIZE_CHAR_NAMES / MAX.size()) * 2};
+	titel.add_component<Text>(
+		size_max, FONT,
+		Text::Data {
+			.world_space = false,
+			.text_color = Color::WHITE,
+		},
+		vec2 {150, -207+Y_OFFSET_NAMES*4+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, MAX
+	);
+
+	const string NIELS = "Niels Stunnebrink";
+	crepe::vec2 size_niels = {NIELS.size()*SIZE_CHAR_NAMES, (NIELS.size()*SIZE_CHAR_NAMES / NIELS.size()) * 2};
+	titel.add_component<Text>(
+		size_niels, FONT,
+		Text::Data {
+			.world_space = false,
+			.text_color = Color::WHITE,
+		},
+		vec2 {150, -207+Y_OFFSET_NAMES*5+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, NIELS
+	);
+
 }
diff --git a/game/menus/shop/ShopMenuScene.cpp b/game/menus/shop/ShopMenuScene.cpp
index 21e3f02..42755d6 100644
--- a/game/menus/shop/ShopMenuScene.cpp
+++ b/game/menus/shop/ShopMenuScene.cpp
@@ -50,6 +50,8 @@ void ShopMenuScene::load_scene() {
 			.scale = 0.8
 		}
 	);
+
+	//
 }
 
 string ShopMenuScene::get_name() const { return SHOP_SCENE; }
-- 
cgit v1.2.3


From 38c88e394414556a464b07e091b4b7fc8fd27b1d Mon Sep 17 00:00:00 2001
From: JAROWMR <jarorutjes07@gmail.com>
Date: Wed, 8 Jan 2025 15:01:21 +0100
Subject: removed enter

---
 game/menus/shop/ShopMenuScene.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/game/menus/shop/ShopMenuScene.cpp b/game/menus/shop/ShopMenuScene.cpp
index 42755d6..21e3f02 100644
--- a/game/menus/shop/ShopMenuScene.cpp
+++ b/game/menus/shop/ShopMenuScene.cpp
@@ -50,8 +50,6 @@ void ShopMenuScene::load_scene() {
 			.scale = 0.8
 		}
 	);
-
-	//
 }
 
 string ShopMenuScene::get_name() const { return SHOP_SCENE; }
-- 
cgit v1.2.3


From 14d2398b776d7be3c404af5f4e983b435efaf1d1 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Wed, 8 Jan 2025 15:03:34 +0100
Subject: `make format`

---
 game/hud/SpeedScript.cpp                 |  4 ++--
 game/menus/ButtonReplaySubScript.cpp     |  5 ++---
 game/menus/ButtonReplaySubScript.h       |  1 +
 game/menus/ButtonSubScene.cpp            |  7 +++----
 game/menus/endgame/EndGameSubScript.cpp  |  2 +-
 game/menus/mainmenu/CreditsSubScene.cpp  | 30 ++++++++++++++++++------------
 game/menus/mainmenu/CreditsSubScript.cpp |  4 +---
 game/menus/mainmenu/CreditsSubScript.h   |  2 +-
 8 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/game/hud/SpeedScript.cpp b/game/hud/SpeedScript.cpp
index 29d4193..906a38f 100644
--- a/game/hud/SpeedScript.cpp
+++ b/game/hud/SpeedScript.cpp
@@ -26,11 +26,11 @@ void SpeedScript::init() {
 void SpeedScript::fixed_update(crepe::duration_t dt) {
 	LoopTimerManager & lp = this->get_loop_timer();
 	if (this->get_key_state(Keycode::PAGE_UP)) {
-		if(lp.get_time_scale() >= 2) return;
+		if (lp.get_time_scale() >= 2) return;
 		lp.set_time_scale(lp.get_time_scale() + 0.1);
 	}
 	if (this->get_key_state(Keycode::PAGE_DOWN)) {
-		if(lp.get_time_scale() <= 0.5) return;
+		if (lp.get_time_scale() <= 0.5) return;
 		lp.set_time_scale(lp.get_time_scale() - 0.1);
 	}
 }
diff --git a/game/menus/ButtonReplaySubScript.cpp b/game/menus/ButtonReplaySubScript.cpp
index 26cb8ee..9308350 100644
--- a/game/menus/ButtonReplaySubScript.cpp
+++ b/game/menus/ButtonReplaySubScript.cpp
@@ -1,9 +1,9 @@
 #include "ButtonReplaySubScript.h"
 #include "MenusConfig.h"
 
+#include "../Events.h"
 #include <crepe/api/AudioSource.h>
 #include <crepe/types.h>
-#include "../Events.h"
 
 using namespace crepe;
 using namespace std;
@@ -19,13 +19,12 @@ void ButtonReplaySubScript::init() {
 	replay.record_start();
 }
 
-
 bool ButtonReplaySubScript::on_button_press(const ButtonPressEvent & e) {
 	replay.play(this->recording);
 	return false;
 }
 
-bool ButtonReplaySubScript::set_recording(){
+bool ButtonReplaySubScript::set_recording() {
 	this->recording = replay.record_end();
 	return false;
 }
diff --git a/game/menus/ButtonReplaySubScript.h b/game/menus/ButtonReplaySubScript.h
index 7e63d06..bfc684d 100644
--- a/game/menus/ButtonReplaySubScript.h
+++ b/game/menus/ButtonReplaySubScript.h
@@ -8,6 +8,7 @@ class ButtonReplaySubScript : public IButtonScript {
 public:
 	void init() override;
 	bool on_button_press(const crepe::ButtonPressEvent & e);
+
 private:
 	crepe::recording_t recording = 0;
 	bool set_recording();
diff --git a/game/menus/ButtonSubScene.cpp b/game/menus/ButtonSubScene.cpp
index d657be9..30646f1 100644
--- a/game/menus/ButtonSubScene.cpp
+++ b/game/menus/ButtonSubScene.cpp
@@ -62,12 +62,11 @@ void ButtonSubScene::set_script(crepe::GameObject & button_object, const Data &
 				.set_script<ButtonNextMainMenuSubScript>();
 			break;
 		case ScriptSelect::REPLAY:
-			button_object.add_component<BehaviorScript>()
-				.set_script<ButtonReplaySubScript>();
+			button_object.add_component<BehaviorScript>().set_script<ButtonReplaySubScript>();
 			break;
 		case ScriptSelect::CREDITS_BACK:
-			button_object.add_component<BehaviorScript>()
-				.set_script<CreditsSubScript>(data.tag);
+			button_object.add_component<BehaviorScript>().set_script<CreditsSubScript>(data.tag
+			);
 			break;
 		case ScriptSelect::CREDITS_SHOW:
 			button_object.add_component<BehaviorScript>()
diff --git a/game/menus/endgame/EndGameSubScript.cpp b/game/menus/endgame/EndGameSubScript.cpp
index 08a9f8c..6edfe7b 100644
--- a/game/menus/endgame/EndGameSubScript.cpp
+++ b/game/menus/endgame/EndGameSubScript.cpp
@@ -1,8 +1,8 @@
 #include "EndGameSubScript.h"
 
 #include "../../Events.h"
-#include "../IFloatingWindowScript.h"
 #include "../ButtonReplaySubScript.h"
+#include "../IFloatingWindowScript.h"
 
 #include <string>
 
diff --git a/game/menus/mainmenu/CreditsSubScene.cpp b/game/menus/mainmenu/CreditsSubScene.cpp
index bdd6fa0..65576ee 100644
--- a/game/menus/mainmenu/CreditsSubScene.cpp
+++ b/game/menus/mainmenu/CreditsSubScene.cpp
@@ -55,7 +55,7 @@ void CreditsSubScene::create(Scene & scn) {
 		ButtonSubScene::Data {
 			.text = "Back",
 			.text_width = 150,
-			.position = {-button_position.x+150, button_position.y},
+			.position = {-button_position.x + 150, button_position.y},
 			.script_type = ButtonSubScene::ScriptSelect::CREDITS_BACK,
 			.button_type = ButtonSubScene::ButtonSelect::BACK,
 			.scale = 0.6,
@@ -69,58 +69,64 @@ void CreditsSubScene::create(Scene & scn) {
 	const float Y_OFFSET_NAMES_BEGIN = 100;
 	const float Y_OFFSET_NAMES = 30;
 	const string LOEK = "Loek Le Blansch";
-	crepe::vec2 size_loek = {LOEK.size()*SIZE_CHAR_NAMES, (LOEK.size()*SIZE_CHAR_NAMES / LOEK.size()) * 2};
+	crepe::vec2 size_loek
+		= {LOEK.size() * SIZE_CHAR_NAMES, (LOEK.size() * SIZE_CHAR_NAMES / LOEK.size()) * 2};
 	titel.add_component<Text>(
 		size_loek, FONT,
 		Text::Data {
 			.world_space = false,
 			.text_color = Color::WHITE,
 		},
-		vec2 {150, -207+Y_OFFSET_NAMES+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, LOEK
+		vec2 {150, -207 + Y_OFFSET_NAMES + Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, LOEK
 	);
 
 	const string WOUTER = "Wouter Boerenkamps";
-	crepe::vec2 size_wouter = {WOUTER.size()*SIZE_CHAR_NAMES, (WOUTER.size()*SIZE_CHAR_NAMES / WOUTER.size()) * 2};
+	crepe::vec2 size_wouter
+		= {WOUTER.size() * SIZE_CHAR_NAMES,
+		   (WOUTER.size() * SIZE_CHAR_NAMES / WOUTER.size()) * 2};
 	titel.add_component<Text>(
 		size_wouter, FONT,
 		Text::Data {
 			.world_space = false,
 			.text_color = Color::WHITE,
 		},
-		vec2 {150, -207+Y_OFFSET_NAMES*2+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, WOUTER
+		vec2 {150, -207 + Y_OFFSET_NAMES * 2 + Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, WOUTER
 	);
 
 	const string JARO = "Jaro Rutjes";
-	crepe::vec2 size_jaro = {JARO.size()*SIZE_CHAR_NAMES, (JARO.size()*SIZE_CHAR_NAMES / JARO.size()) * 2};
+	crepe::vec2 size_jaro
+		= {JARO.size() * SIZE_CHAR_NAMES, (JARO.size() * SIZE_CHAR_NAMES / JARO.size()) * 2};
 	titel.add_component<Text>(
 		size_jaro, FONT,
 		Text::Data {
 			.world_space = false,
 			.text_color = Color::WHITE,
 		},
-		vec2 {150, -207+Y_OFFSET_NAMES*3+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, JARO
+		vec2 {150, -207 + Y_OFFSET_NAMES * 3 + Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, JARO
 	);
 
 	const string MAX = "Max Smits";
-	crepe::vec2 size_max = {MAX.size()*SIZE_CHAR_NAMES, (MAX.size()*SIZE_CHAR_NAMES / MAX.size()) * 2};
+	crepe::vec2 size_max
+		= {MAX.size() * SIZE_CHAR_NAMES, (MAX.size() * SIZE_CHAR_NAMES / MAX.size()) * 2};
 	titel.add_component<Text>(
 		size_max, FONT,
 		Text::Data {
 			.world_space = false,
 			.text_color = Color::WHITE,
 		},
-		vec2 {150, -207+Y_OFFSET_NAMES*4+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, MAX
+		vec2 {150, -207 + Y_OFFSET_NAMES * 4 + Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, MAX
 	);
 
 	const string NIELS = "Niels Stunnebrink";
-	crepe::vec2 size_niels = {NIELS.size()*SIZE_CHAR_NAMES, (NIELS.size()*SIZE_CHAR_NAMES / NIELS.size()) * 2};
+	crepe::vec2 size_niels
+		= {NIELS.size() * SIZE_CHAR_NAMES, (NIELS.size() * SIZE_CHAR_NAMES / NIELS.size()) * 2
+		};
 	titel.add_component<Text>(
 		size_niels, FONT,
 		Text::Data {
 			.world_space = false,
 			.text_color = Color::WHITE,
 		},
-		vec2 {150, -207+Y_OFFSET_NAMES*5+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, NIELS
+		vec2 {150, -207 + Y_OFFSET_NAMES * 5 + Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, NIELS
 	);
-
 }
diff --git a/game/menus/mainmenu/CreditsSubScript.cpp b/game/menus/mainmenu/CreditsSubScript.cpp
index ce74ba4..4224dc8 100644
--- a/game/menus/mainmenu/CreditsSubScript.cpp
+++ b/game/menus/mainmenu/CreditsSubScript.cpp
@@ -1,8 +1,8 @@
 #include "CreditsSubScript.h"
 
 #include "../../Events.h"
-#include "../IFloatingWindowScript.h"
 #include "../ButtonReplaySubScript.h"
+#include "../IFloatingWindowScript.h"
 
 #include <string>
 
@@ -13,7 +13,6 @@
 
 using namespace crepe;
 
-
 CreditsSubScript::CreditsSubScript(const std::string & tag) { this->tag = tag; }
 
 void CreditsSubScript::init() {
@@ -57,4 +56,3 @@ bool CreditsSubScript::enable_all() {
 bool CreditsSubScript::on_button_press(const ButtonPressEvent & e) {
 	return this->disable_all();
 }
-
diff --git a/game/menus/mainmenu/CreditsSubScript.h b/game/menus/mainmenu/CreditsSubScript.h
index e411202..81f941a 100644
--- a/game/menus/mainmenu/CreditsSubScript.h
+++ b/game/menus/mainmenu/CreditsSubScript.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../IFloatingWindowScript.h"
 #include "../IButtonScript.h"
+#include "../IFloatingWindowScript.h"
 
 #include <crepe/api/Event.h>
 #include <crepe/api/Script.h>
-- 
cgit v1.2.3


From c12366610c4d8732362d602864e805575b31a9d2 Mon Sep 17 00:00:00 2001
From: Max-001 <maxsmits21@kpnmail.nl>
Date: Wed, 8 Jan 2025 15:10:48 +0100
Subject: Made shop

---
 game/menus/shop/ShopMenuScene.cpp | 71 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/game/menus/shop/ShopMenuScene.cpp b/game/menus/shop/ShopMenuScene.cpp
index 21e3f02..ee0fb6b 100644
--- a/game/menus/shop/ShopMenuScene.cpp
+++ b/game/menus/shop/ShopMenuScene.cpp
@@ -1,12 +1,15 @@
 
 #include "ShopMenuScene.h"
 
+#include "../../Config.h"
 #include "../BannerSubScene.h"
 #include "../ButtonSubScene.h"
 #include "../MenusConfig.h"
+#include "types.h"
 
 #include <crepe/api/Camera.h>
 #include <crepe/api/Sprite.h>
+#include <crepe/api/Text.h>
 
 using namespace crepe;
 using namespace std;
@@ -50,6 +53,74 @@ void ShopMenuScene::load_scene() {
 			.scale = 0.8
 		}
 	);
+
+	GameObject shop_item_bullet = this->new_object("bullet", "shop_item", vec2(-100, 0));
+	shop_item_bullet.add_component<Sprite>(
+		Asset("asset/other_effects/effect_rocketmgshell_TVOS.png"),
+		Sprite::Data {
+			.sorting_in_layer = STARTING_SORTING_IN_LAYER + 1,
+			.size = {0, 100},
+			.position_offset = {0, 0},
+		}
+	);
+	shop_item_bullet.add_component<Text>(
+		vec2 {100, 50}, FONT,
+		Text::Data {
+			.world_space = true,
+			.text_color = Color::WHITE,
+		},
+		vec2 {0, -75}, "BULLETS"
+	);
+	shop_item_bullet.add_component<Sprite>(
+		Asset("asset/ui/buttonCoinsSmall.png"),
+		Sprite::Data {
+			.sorting_in_layer = STARTING_SORTING_IN_LAYER + 1,
+			.size = {0, 45},
+			.position_offset = {25, 75},
+		}
+	);
+	shop_item_bullet.add_component<Text>(
+		vec2 {37.5, 37.5}, FONT,
+		Text::Data {
+			.world_space = true,
+			.text_color = Color::YELLOW,
+		},
+		vec2 {-25, 75}, "0"
+	);
+
+	GameObject shop_item_bubble = this->new_object("bubble", "shop_item", vec2(100, 0));
+	shop_item_bubble.add_component<Sprite>(
+		Asset("asset/background/aquarium/bubble.png"),
+		Sprite::Data {
+			.sorting_in_layer = STARTING_SORTING_IN_LAYER + 1,
+			.size = {0, 100},
+			.position_offset = {0, 0},
+		}
+	);
+	shop_item_bubble.add_component<Text>(
+		vec2 {100, 50}, FONT,
+		Text::Data {
+			.world_space = true,
+			.text_color = Color::WHITE,
+		},
+		vec2 {0, -75}, "BUBBLE"
+	);
+	shop_item_bubble.add_component<Sprite>(
+		Asset("asset/ui/buttonCoinsSmall.png"),
+		Sprite::Data {
+			.sorting_in_layer = STARTING_SORTING_IN_LAYER + 1,
+			.size = {0, 45},
+			.position_offset = {45, 75},
+		}
+	);
+	shop_item_bubble.add_component<Text>(
+		vec2 {100, 25}, FONT,
+		Text::Data {
+			.world_space = true,
+			.text_color = Color::YELLOW,
+		},
+		vec2 {-25, 75}, "1000"
+	);
 }
 
 string ShopMenuScene::get_name() const { return SHOP_SCENE; }
-- 
cgit v1.2.3


From 05ce2c58165dc1566c32c6a661d70bad51e3fe15 Mon Sep 17 00:00:00 2001
From: Max-001 <maxsmits21@kpnmail.nl>
Date: Wed, 8 Jan 2025 15:17:45 +0100
Subject: Added shop items

---
 game/Config.h                     | 3 +++
 game/hud/HudSubScene.cpp          | 2 +-
 game/menus/shop/ShopMenuScene.cpp | 4 ++--
 src/crepe/api/Color.cpp           | 1 +
 src/crepe/api/Color.h             | 1 +
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/game/Config.h b/game/Config.h
index f1b64b3..c2f95c0 100644
--- a/game/Config.h
+++ b/game/Config.h
@@ -45,3 +45,6 @@ static constexpr const char * DISTANCE_RUN = "distance_run";
 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
+
+// Jetpack particles
+static constexpr const char * JETPACK_PARTICLES = "jetpack_particles";
diff --git a/game/hud/HudSubScene.cpp b/game/hud/HudSubScene.cpp
index ca81614..dcc07b4 100644
--- a/game/hud/HudSubScene.cpp
+++ b/game/hud/HudSubScene.cpp
@@ -45,7 +45,7 @@ void HudSubScene::create(Scene & scn) {
 		size_coin, FONT,
 		Text::Data {
 			.world_space = false,
-			.text_color = Color::YELLOW,
+			.text_color = Color::GOLD,
 		},
 		TOP_LEFT + FONTOFFSET + COINS_OFFSET + vec2 {COINS_LENGTH * COINS_CHAR_WIDTH / 2, 0},
 		COINS
diff --git a/game/menus/shop/ShopMenuScene.cpp b/game/menus/shop/ShopMenuScene.cpp
index ee0fb6b..d1ea81d 100644
--- a/game/menus/shop/ShopMenuScene.cpp
+++ b/game/menus/shop/ShopMenuScene.cpp
@@ -83,7 +83,7 @@ void ShopMenuScene::load_scene() {
 		vec2 {37.5, 37.5}, FONT,
 		Text::Data {
 			.world_space = true,
-			.text_color = Color::YELLOW,
+			.text_color = Color::GOLD,
 		},
 		vec2 {-25, 75}, "0"
 	);
@@ -117,7 +117,7 @@ void ShopMenuScene::load_scene() {
 		vec2 {100, 25}, FONT,
 		Text::Data {
 			.world_space = true,
-			.text_color = Color::YELLOW,
+			.text_color = Color::GOLD,
 		},
 		vec2 {-25, 75}, "1000"
 	);
diff --git a/src/crepe/api/Color.cpp b/src/crepe/api/Color.cpp
index 1374198..d0e3b35 100644
--- a/src/crepe/api/Color.cpp
+++ b/src/crepe/api/Color.cpp
@@ -11,3 +11,4 @@ const Color Color::CYAN {0x00, 0xff, 0xff};
 const Color Color::YELLOW {0xff, 0xff, 0x00};
 const Color Color::MAGENTA {0xff, 0x00, 0xff};
 const Color Color::GREY {0x80, 0x80, 0x80};
+const Color Color::GOLD {249, 205, 91};
diff --git a/src/crepe/api/Color.h b/src/crepe/api/Color.h
index 22c0c43..dbfd0ed 100644
--- a/src/crepe/api/Color.h
+++ b/src/crepe/api/Color.h
@@ -19,6 +19,7 @@ struct Color {
 	static const Color YELLOW;
 	static const Color BLACK;
 	static const Color GREY;
+	static const Color GOLD;
 };
 
 } // namespace crepe
-- 
cgit v1.2.3


From e732abef5d0170cacf290de12a402dbd19f31a87 Mon Sep 17 00:00:00 2001
From: Max-001 <maxsmits21@kpnmail.nl>
Date: Wed, 8 Jan 2025 15:26:54 +0100
Subject: Fixed end window

---
 game/player/PlayerEndScript.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game/player/PlayerEndScript.cpp b/game/player/PlayerEndScript.cpp
index fb18f2f..047dbb0 100644
--- a/game/player/PlayerEndScript.cpp
+++ b/game/player/PlayerEndScript.cpp
@@ -90,7 +90,7 @@ bool PlayerEndScript::on_collision(const crepe::CollisionEvent & ev) {
 			jump++;
 		}
 
-		if (rb_player.data.linear_velocity.x < 5) {
+		if (rb_player.data.linear_velocity.x < 5 && jump >= 3) {
 			this->trigger_event<EndGameEvent>();
 		}
 
-- 
cgit v1.2.3