diff --git a/.gitignore b/.gitignore index 2828ca2..93eaf00 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ build/ resources/concept art/ + +resources/textures/beehive.png~ diff --git a/entities/Beehive.tscn b/entities/Beehive.tscn index 207410a..61ff1e2 100644 --- a/entities/Beehive.tscn +++ b/entities/Beehive.tscn @@ -40,9 +40,10 @@ texture = ExtResource("2_2xhre") [node name="DropShadowComponent" parent="." node_paths=PackedStringArray("parent_sprite") instance=ExtResource("3_uglsl")] parent_sprite = NodePath("../BeehiveSprite") -drop_shadow_distance = 20 +drop_shadow_distance = 25 [node name="Area2D" type="Area2D" parent="."] +visible = false [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] shape = SubResource("CircleShape2D_h6wmc") diff --git a/levels/level_1.tscn b/levels/level_1.tscn index 40729e9..383ffed 100644 --- a/levels/level_1.tscn +++ b/levels/level_1.tscn @@ -152,6 +152,7 @@ offset_bottom = 720.0 mouse_filter = 1 [node name="GameOverComponent" parent="." instance=ExtResource("15_jn0bj")] +visible = false z_index = 900 offset_right = 1280.0 offset_bottom = 720.0 diff --git a/levels/level_2.tscn b/levels/level_2.tscn index 65ef54d..c0cf5ba 100644 --- a/levels/level_2.tscn +++ b/levels/level_2.tscn @@ -141,7 +141,7 @@ unique_name_in_owner = true [node name="UiComponent" parent="." instance=ExtResource("12_mmtyl")] unique_name_in_owner = true -z_index = 20 +z_index = 900 offset_right = 1280.0 offset_bottom = 720.0 @@ -155,6 +155,7 @@ offset_right = 1280.0 offset_bottom = 720.0 [node name="GameOverComponent" parent="." instance=ExtResource("16_450js")] +visible = false z_index = 900 offset_right = 1280.0 offset_bottom = 720.0 diff --git a/levels/level_3.tscn b/levels/level_3.tscn index d9c6f63..4888d56 100644 --- a/levels/level_3.tscn +++ b/levels/level_3.tscn @@ -187,6 +187,7 @@ offset_right = 1280.0 offset_bottom = 720.0 [node name="GameOverComponent" parent="." instance=ExtResource("16_61bnh")] +visible = false z_index = 900 offset_right = 1280.0 offset_bottom = 720.0 diff --git a/levels/level_5.tscn b/levels/level_5.tscn index cf0233d..d59b044 100644 --- a/levels/level_5.tscn +++ b/levels/level_5.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=17 format=3 uid="uid://vvk5h14u0i1k"] +[gd_scene load_steps=18 format=3 uid="uid://vvk5h14u0i1k"] [ext_resource type="Script" path="res://levels/scripts/level_3.gd" id="1_7viev"] [ext_resource type="PackedScene" uid="uid://dn6aa6f2f4g4i" path="res://components/RulesComponent.tscn" id="2_d6prf"] @@ -16,6 +16,7 @@ [ext_resource type="PackedScene" uid="uid://cwutwy11pityw" path="res://ui/LevelCompleteComponent.tscn" id="14_i1bii"] [ext_resource type="PackedScene" uid="uid://b5whit1dshr3" path="res://ui/GameOverComponent.tscn" id="15_2iprn"] [ext_resource type="PackedScene" uid="uid://cfhoi2rqxa3up" path="res://entities/Dog.tscn" id="16_jy3y1"] +[ext_resource type="PackedScene" uid="uid://clomllso36j02" path="res://entities/VegetablePatch.tscn" id="17_0sreo"] [node name="Level5" type="Node2D"] script = ExtResource("1_7viev") @@ -26,7 +27,19 @@ game_rules = ExtResource("3_xjoeh") [node name="Grass" parent="." instance=ExtResource("4_o2mgo")] -[node name="LevelDecor" type="Node" parent="."] +[node name="Beehive" parent="." groups=["beehive"] instance=ExtResource("10_ogjm5")] +unique_name_in_owner = true +position = Vector2(138, 488) + +[node name="Dog" parent="." instance=ExtResource("16_jy3y1")] +position = Vector2(1021, 227) +rotation = 0.844739 + +[node name="VegetablePatch" parent="." instance=ExtResource("17_0sreo")] +position = Vector2(382, 146) +scale = Vector2(0.5, 0.5) + +[node name="LevelDecor" type="Node2D" parent="."] [node name="BushGroup" type="Node2D" parent="LevelDecor"] position = Vector2(-243, -56) @@ -45,7 +58,7 @@ rotation = 0.60912 scale = Vector2(0.4, 0.4) [node name="BushGroup4" type="Node2D" parent="LevelDecor"] -position = Vector2(8, -4) +position = Vector2(83, 221) [node name="Bush" parent="LevelDecor/BushGroup4" instance=ExtResource("5_ldaym")] position = Vector2(1110, 28) @@ -79,47 +92,56 @@ scale = Vector2(0.4, 0.4) [node name="BushGroup2" type="Node2D" parent="LevelDecor"] position = Vector2(1291, 1886) -rotation = 4.5012 +rotation = -1.78199 [node name="Bush" parent="LevelDecor/BushGroup2" instance=ExtResource("5_ldaym")] +visible = false position = Vector2(1110, 28) scale = Vector2(0.25, 0.25) [node name="Bush3" parent="LevelDecor/BushGroup2" instance=ExtResource("5_ldaym")] -position = Vector2(1272, 123) +position = Vector2(1235.53, -33.756) scale = Vector2(0.25, 0.25) [node name="Bush2" parent="LevelDecor/BushGroup2" instance=ExtResource("5_ldaym")] +visible = false position = Vector2(1214, 47) rotation = 0.60912 scale = Vector2(0.4, 0.4) [node name="NakedTree" parent="LevelDecor" instance=ExtResource("6_4xst1")] -position = Vector2(-41, 437) +position = Vector2(57, 251) scale = Vector2(0.6, 0.6) [node name="Tree" parent="LevelDecor" instance=ExtResource("7_bmsu5")] position = Vector2(217, 52) scale = Vector2(0.6, 0.6) +[node name="Tree3" parent="LevelDecor" instance=ExtResource("7_bmsu5")] +position = Vector2(-27, 309) +rotation = 1.54811 +scale = Vector2(0.3, 0.3) + [node name="Tree2" parent="LevelDecor" instance=ExtResource("7_bmsu5")] position = Vector2(1175, -35) rotation = -0.42237 scale = Vector2(0.6, 0.6) [node name="Mushrooms" type="Node2D" parent="LevelDecor"] -position = Vector2(-254, 571) -rotation = -0.60912 +position = Vector2(42, 290) +rotation = 0.563741 +scale = Vector2(1, 1) [node name="Mushroom" parent="LevelDecor/Mushrooms" instance=ExtResource("8_dtrxx")] position = Vector2(232, 250) scale = Vector2(0.5, 0.5) [node name="Mushroom4" parent="LevelDecor/Mushrooms" instance=ExtResource("8_dtrxx")] -position = Vector2(1209.52, 209.747) +position = Vector2(133.124, -146.86) scale = Vector2(0.5, 0.5) [node name="Mushroom2" parent="LevelDecor/Mushrooms" instance=ExtResource("8_dtrxx")] +visible = false position = Vector2(252, 289) rotation = 1.13446 scale = Vector2(0.3, 0.3) @@ -149,11 +171,7 @@ scale = Vector2(0.3, 0.3) [node name="Flowers" parent="." instance=ExtResource("9_ne0y1")] unique_name_in_owner = true -position = Vector2(1102, 298) - -[node name="Beehive" parent="." groups=["beehive"] instance=ExtResource("10_ogjm5")] -unique_name_in_owner = true -position = Vector2(272, 427) +position = Vector2(1092, 495) [node name="BeeSpawner" parent="." instance=ExtResource("11_kkv2y")] unique_name_in_owner = true @@ -180,6 +198,24 @@ z_index = 900 offset_right = 1280.0 offset_bottom = 720.0 -[node name="Dog" parent="." instance=ExtResource("16_jy3y1")] -position = Vector2(731, 309) -rotation = 0.844739 +[node name="VegetablePatch5" parent="." instance=ExtResource("17_0sreo")] +position = Vector2(620, 691) +scale = Vector2(0.5, 0.5) + +[node name="VegetablePatch6" parent="." instance=ExtResource("17_0sreo")] +position = Vector2(837, 732) +scale = Vector2(0.5, 0.5) + +[node name="VegetablePatch2" parent="." instance=ExtResource("17_0sreo")] +position = Vector2(384, 624) +scale = Vector2(0.5, 0.5) + +[node name="VegetablePatch3" parent="." instance=ExtResource("17_0sreo")] +position = Vector2(747, 374) +rotation = 1.5708 +scale = Vector2(0.5, 0.5) + +[node name="VegetablePatch4" parent="." instance=ExtResource("17_0sreo")] +position = Vector2(743, 151) +rotation = 1.5708 +scale = Vector2(0.5, 0.5) diff --git a/levels/level_6.tscn b/levels/level_6.tscn new file mode 100644 index 0000000..07131a9 --- /dev/null +++ b/levels/level_6.tscn @@ -0,0 +1,225 @@ +[gd_scene load_steps=18 format=3 uid="uid://dtrqvifl07hgo"] + +[ext_resource type="Script" path="res://levels/scripts/level_3.gd" id="1_hg53e"] +[ext_resource type="PackedScene" uid="uid://dn6aa6f2f4g4i" path="res://components/RulesComponent.tscn" id="2_ufpjb"] +[ext_resource type="Resource" uid="uid://bts21313fjhri" path="res://levels/rules/level_6_rules.tres" id="3_ckppu"] +[ext_resource type="PackedScene" uid="uid://d1uawawum16b0" path="res://scenes/elements/background.tscn" id="4_7ro3d"] +[ext_resource type="PackedScene" uid="uid://dyu4mucawjlu6" path="res://entities/Beehive.tscn" id="5_613ii"] +[ext_resource type="PackedScene" uid="uid://cfhoi2rqxa3up" path="res://entities/Dog.tscn" id="6_fbrq3"] +[ext_resource type="PackedScene" uid="uid://clomllso36j02" path="res://entities/VegetablePatch.tscn" id="7_85a4g"] +[ext_resource type="PackedScene" uid="uid://dwuc6byusf1r3" path="res://scenes/decor/bush.tscn" id="8_cbi4d"] +[ext_resource type="PackedScene" uid="uid://dj51rgpihnhi" path="res://scenes/decor/naked_tree.tscn" id="9_hxin4"] +[ext_resource type="PackedScene" uid="uid://d3mas42mbgec1" path="res://scenes/decor/tree.tscn" id="10_60f2e"] +[ext_resource type="PackedScene" uid="uid://eiyribk1ijcu" path="res://scenes/decor/mushroom.tscn" id="11_hhoco"] +[ext_resource type="PackedScene" uid="uid://bme541qdw7nai" path="res://entities/Flowers.tscn" id="12_75856"] +[ext_resource type="PackedScene" uid="uid://ddf2mkkw1trkj" path="res://scenes/elements/bee_spawner.tscn" id="13_wjpeu"] +[ext_resource type="PackedScene" uid="uid://b7eeptlk47ymd" path="res://ui/UiComponent.tscn" id="14_05wvt"] +[ext_resource type="PackedScene" uid="uid://ct3c16xm33r2a" path="res://scenes/elements/drone_manager.tscn" id="15_6fk1g"] +[ext_resource type="PackedScene" uid="uid://cwutwy11pityw" path="res://ui/LevelCompleteComponent.tscn" id="16_r0rm6"] +[ext_resource type="PackedScene" uid="uid://b5whit1dshr3" path="res://ui/GameOverComponent.tscn" id="17_x23hi"] + +[node name="Level6" type="Node2D"] +script = ExtResource("1_hg53e") + +[node name="RulesComponent" parent="." instance=ExtResource("2_ufpjb")] +unique_name_in_owner = true +game_rules = ExtResource("3_ckppu") + +[node name="Grass" parent="." instance=ExtResource("4_7ro3d")] + +[node name="Beehive" parent="." groups=["beehive"] instance=ExtResource("5_613ii")] +unique_name_in_owner = true +position = Vector2(647, 184) + +[node name="VegetablePatch6" parent="." instance=ExtResource("7_85a4g")] +position = Vector2(568, 516) +rotation = 1.5708 +scale = Vector2(0.4, 0.4) + +[node name="VegetablePatch" parent="." instance=ExtResource("7_85a4g")] +position = Vector2(465, 301) +scale = Vector2(0.4, 0.4) + +[node name="VegetablePatch3" parent="." instance=ExtResource("7_85a4g")] +position = Vector2(276, 230) +rotation = 0.785398 +scale = Vector2(0.4, 0.4) + +[node name="VegetablePatch2" parent="." instance=ExtResource("7_85a4g")] +position = Vector2(833, 309) +scale = Vector2(0.4, 0.4) + +[node name="VegetablePatch4" parent="." instance=ExtResource("7_85a4g")] +position = Vector2(1013, 227) +rotation = -0.785398 +scale = Vector2(0.4, 0.4) + +[node name="VegetablePatch5" parent="." instance=ExtResource("7_85a4g")] +position = Vector2(1236, 441) +rotation = -0.785398 +scale = Vector2(0.4, 0.4) + +[node name="LevelDecor" type="Node2D" parent="."] + +[node name="BushGroup" type="Node2D" parent="LevelDecor"] +position = Vector2(-243, -56) + +[node name="Bush" parent="LevelDecor/BushGroup" instance=ExtResource("8_cbi4d")] +position = Vector2(1110, 28) +scale = Vector2(0.25, 0.25) + +[node name="Bush3" parent="LevelDecor/BushGroup" instance=ExtResource("8_cbi4d")] +position = Vector2(495, 53) +scale = Vector2(0.25, 0.25) + +[node name="Bush2" parent="LevelDecor/BushGroup" instance=ExtResource("8_cbi4d")] +position = Vector2(1214, 47) +rotation = 0.60912 +scale = Vector2(0.4, 0.4) + +[node name="BushGroup4" type="Node2D" parent="LevelDecor"] +position = Vector2(83, 221) + +[node name="Bush" parent="LevelDecor/BushGroup4" instance=ExtResource("8_cbi4d")] +position = Vector2(1110, 28) +scale = Vector2(0.25, 0.25) + +[node name="Bush3" parent="LevelDecor/BushGroup4" instance=ExtResource("8_cbi4d")] +position = Vector2(1272, 123) +scale = Vector2(0.25, 0.25) + +[node name="Bush2" parent="LevelDecor/BushGroup4" instance=ExtResource("8_cbi4d")] +position = Vector2(1214, 47) +rotation = 0.60912 +scale = Vector2(0.4, 0.4) + +[node name="BushGroup3" type="Node2D" parent="LevelDecor"] +position = Vector2(-928, 592) +scale = Vector2(0.75, 0.75) + +[node name="Bush" parent="LevelDecor/BushGroup3" instance=ExtResource("8_cbi4d")] +position = Vector2(1726.67, -413.333) +scale = Vector2(0.25, 0.25) + +[node name="Bush3" parent="LevelDecor/BushGroup3" instance=ExtResource("8_cbi4d")] +position = Vector2(1309.33, 81.3333) +scale = Vector2(0.25, 0.25) + +[node name="Bush2" parent="LevelDecor/BushGroup3" instance=ExtResource("8_cbi4d")] +position = Vector2(1233.33, -340) +rotation = 0.60912 +scale = Vector2(0.4, 0.4) + +[node name="BushGroup2" type="Node2D" parent="LevelDecor"] +position = Vector2(1291, 1886) +rotation = -1.78199 + +[node name="Bush" parent="LevelDecor/BushGroup2" instance=ExtResource("8_cbi4d")] +visible = false +position = Vector2(1110, 28) +scale = Vector2(0.25, 0.25) + +[node name="Bush3" parent="LevelDecor/BushGroup2" instance=ExtResource("8_cbi4d")] +position = Vector2(1235.53, -33.756) +scale = Vector2(0.25, 0.25) + +[node name="Bush2" parent="LevelDecor/BushGroup2" instance=ExtResource("8_cbi4d")] +visible = false +position = Vector2(1214, 47) +rotation = 0.60912 +scale = Vector2(0.4, 0.4) + +[node name="NakedTree" parent="LevelDecor" instance=ExtResource("9_hxin4")] +position = Vector2(-4, 157) +scale = Vector2(0.6, 0.6) + +[node name="Tree" parent="LevelDecor" instance=ExtResource("10_60f2e")] +position = Vector2(59, -4) +scale = Vector2(0.6, 0.6) + +[node name="Tree3" parent="LevelDecor" instance=ExtResource("10_60f2e")] +position = Vector2(648, 371) +rotation = 0.986111 +scale = Vector2(0.25, 0.25) + +[node name="Tree2" parent="LevelDecor" instance=ExtResource("10_60f2e")] +position = Vector2(1175, -35) +rotation = -0.42237 +scale = Vector2(0.6, 0.6) + +[node name="Mushrooms" type="Node2D" parent="LevelDecor"] +position = Vector2(42, 290) +rotation = 0.563741 + +[node name="Mushroom" parent="LevelDecor/Mushrooms" instance=ExtResource("11_hhoco")] +position = Vector2(232, 250) +scale = Vector2(0.5, 0.5) + +[node name="Mushroom4" parent="LevelDecor/Mushrooms" instance=ExtResource("11_hhoco")] +position = Vector2(54.3027, -282.772) +scale = Vector2(0.5, 0.5) + +[node name="Mushroom2" parent="LevelDecor/Mushrooms" instance=ExtResource("11_hhoco")] +position = Vector2(949.017, -785.684) +rotation = 1.13446 +scale = Vector2(0.3, 0.3) + +[node name="Mushroom3" parent="LevelDecor/Mushrooms" instance=ExtResource("11_hhoco")] +position = Vector2(260, 225) +rotation = 1.13446 +scale = Vector2(0.3, 0.3) + +[node name="Mushrooms2" type="Node2D" parent="LevelDecor"] +position = Vector2(1551, 802) +rotation = 2.81347 + +[node name="Mushroom" parent="LevelDecor/Mushrooms2" instance=ExtResource("11_hhoco")] +position = Vector2(321.639, 243.653) +scale = Vector2(0.5, 0.5) + +[node name="Mushroom2" parent="LevelDecor/Mushrooms2" instance=ExtResource("11_hhoco")] +position = Vector2(252, 289) +rotation = 1.13446 +scale = Vector2(0.3, 0.3) + +[node name="Mushroom3" parent="LevelDecor/Mushrooms2" instance=ExtResource("11_hhoco")] +position = Vector2(260, 225) +rotation = 1.13446 +scale = Vector2(0.3, 0.3) + +[node name="Flowers" parent="." instance=ExtResource("12_75856")] +unique_name_in_owner = true +position = Vector2(197, 524) + +[node name="Flowers2" parent="." instance=ExtResource("12_75856")] +unique_name_in_owner = true +position = Vector2(1006, 486) + +[node name="Dog" parent="." instance=ExtResource("6_fbrq3")] +position = Vector2(1007, 488) +rotation = 0.844739 + +[node name="BeeSpawner" parent="." instance=ExtResource("13_wjpeu")] +unique_name_in_owner = true + +[node name="UiComponent" parent="." instance=ExtResource("14_05wvt")] +unique_name_in_owner = true +z_index = 1000 +offset_right = 1280.0 +offset_bottom = 720.0 +mouse_filter = 1 + +[node name="DroneManager" parent="." instance=ExtResource("15_6fk1g")] +unique_name_in_owner = true + +[node name="LevelCompleteComponent" parent="." instance=ExtResource("16_r0rm6")] +visible = false +z_index = 999 +offset_right = 1280.0 +offset_bottom = 720.0 + +[node name="GameOverComponent" parent="." instance=ExtResource("17_x23hi")] +visible = false +z_index = 900 +offset_right = 1280.0 +offset_bottom = 720.0 diff --git a/levels/rules/level_6_rules.tres b/levels/rules/level_6_rules.tres new file mode 100644 index 0000000..acc15d6 --- /dev/null +++ b/levels/rules/level_6_rules.tres @@ -0,0 +1,16 @@ +[gd_resource type="Resource" script_class="GameRulesResource" load_steps=2 format=3 uid="uid://bts21313fjhri"] + +[ext_resource type="Script" path="res://components/scripts/game_rules.gd" id="1_j7qva"] + +[resource] +script = ExtResource("1_j7qva") +level_number = 6 +level_name = "Level Six" +level_description = "Serious Business" +bees_available = 120 +nectar_required = 300 +level_par = 6 +collector_enabled = true +dancer_enabled = true +director_enabled = true +distractor_enabled = true diff --git a/resources/textures/beehive.png b/resources/textures/beehive.png index 7d1d69b..47a8d62 100644 Binary files a/resources/textures/beehive.png and b/resources/textures/beehive.png differ