Merge pull request #132 from lonkaars/max/game2

Bug fixes

2 files changed, 114 insertions, 4 deletions

diff --git a/game/StartGameScript.cpp b/game/StartGameScript.cpp
index 48055af..6d47e65 100644
--- a/game/StartGameScript.cpp
+++ b/game/StartGameScript.cpp
@@ -64,7 +64,7 @@ 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<Rigidbody>("camera").front();
-		rb.data.linear_velocity = vec2(PLAYER_SPEED * dt.count(), 0);
+		rb.data.linear_velocity = vec2(PLAYER_SPEED * 0.02, 0);
 		BehaviorScript & player_script
 			= this->get_components_by_name<BehaviorScript>("player").front();
 		player_script.active = true;
diff --git a/game/menus/shop/ShopMenuScene.cpp b/game/menus/shop/ShopMenuScene.cpp
index 641352c..4975a95 100644
--- a/game/menus/shop/ShopMenuScene.cpp
+++ b/game/menus/shop/ShopMenuScene.cpp
@@ -54,7 +54,8 @@ void ShopMenuScene::load_scene() {
 			.position = {-400, -350},
 			.script_type = ButtonSubScene::ScriptSelect::MAINMENU,
 			.button_type = ButtonSubScene::ButtonSelect::BACK,
-			.scale = 0.8
+			.scale = 0.8,
+			.sorting_layer_offset = 1,
 		}
 	);
 
@@ -67,10 +68,47 @@ void ShopMenuScene::load_scene() {
 		Asset("asset/other_effects/effect_rocketmgshell_TVOS.png"),
 		Sprite::Data {
 			.sorting_in_layer = STARTING_SORTING_IN_LAYER + 1,
-			.size = {0, 100},
+			.size = {0, 20},
+			.angle_offset = 30,
 			.position_offset = {0, 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, 20},
+			.angle_offset = 10,
+			.position_offset = {-10, -30},
+		}
+	);
+	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, 20},
+			.angle_offset = -10,
+			.position_offset = {-40, 30},
+		}
+	);
+	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, 20},
+			.angle_offset = 0,
+			.position_offset = {10, 15},
+		}
+	);
+	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, 20},
+			.angle_offset = -5,
+			.position_offset = {45, -5},
+		}
+	);
 
 	const string BULLETS_STRING = "BULLETS";
 	size
@@ -112,10 +150,82 @@ void ShopMenuScene::load_scene() {
 		Asset("asset/background/aquarium/bubble.png"),
 		Sprite::Data {
 			.sorting_in_layer = STARTING_SORTING_IN_LAYER + 1,
-			.size = {0, 100},
+			.size = {0, 10},
 			.position_offset = {0, 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, 10},
+			.position_offset = {-50, -20},
+		}
+	);
+	shop_item_bubble.add_component<Sprite>(
+		Asset("asset/background/aquarium/bubble.png"),
+		Sprite::Data {
+			.sorting_in_layer = STARTING_SORTING_IN_LAYER + 1,
+			.size = {0, 20},
+			.position_offset = {45, -40},
+		}
+	);
+	shop_item_bubble.add_component<Sprite>(
+		Asset("asset/background/aquarium/bubble.png"),
+		Sprite::Data {
+			.sorting_in_layer = STARTING_SORTING_IN_LAYER + 1,
+			.size = {0, 20},
+			.position_offset = {-20, 40},
+		}
+	);
+	shop_item_bubble.add_component<Sprite>(
+		Asset("asset/background/aquarium/bubble.png"),
+		Sprite::Data {
+			.sorting_in_layer = STARTING_SORTING_IN_LAYER + 1,
+			.size = {0, 15},
+			.position_offset = {15, -25},
+		}
+	);
+	shop_item_bubble.add_component<Sprite>(
+		Asset("asset/background/aquarium/bubble.png"),
+		Sprite::Data {
+			.sorting_in_layer = STARTING_SORTING_IN_LAYER + 1,
+			.size = {0, 10},
+			.position_offset = {10, 5},
+		}
+	);
+	shop_item_bubble.add_component<Sprite>(
+		Asset("asset/background/aquarium/bubble.png"),
+		Sprite::Data {
+			.sorting_in_layer = STARTING_SORTING_IN_LAYER + 1,
+			.size = {0, 10},
+			.position_offset = {-5, -20},
+		}
+	);
+	shop_item_bubble.add_component<Sprite>(
+		Asset("asset/background/aquarium/bubble.png"),
+		Sprite::Data {
+			.sorting_in_layer = STARTING_SORTING_IN_LAYER + 1,
+			.size = {0, 20},
+			.position_offset = {15, -40},
+		}
+	);
+	shop_item_bubble.add_component<Sprite>(
+		Asset("asset/background/aquarium/bubble.png"),
+		Sprite::Data {
+			.sorting_in_layer = STARTING_SORTING_IN_LAYER + 1,
+			.size = {0, 20},
+			.position_offset = {-20, 10},
+		}
+	);
+	shop_item_bubble.add_component<Sprite>(
+		Asset("asset/background/aquarium/bubble.png"),
+		Sprite::Data {
+			.sorting_in_layer = STARTING_SORTING_IN_LAYER + 1,
+			.size = {0, 15},
+			.position_offset = {30, -25},
+		}
+	);
 
 	const string BUBBLE_STRING = "BUBBLE";
 	size