diff --git a/entities/player/player.tscn b/entities/player/player.tscn index 6216e7f..666aaa8 100644 --- a/entities/player/player.tscn +++ b/entities/player/player.tscn @@ -22,7 +22,7 @@ position = Vector2(-2, 15) shape = SubResource("CircleShape2D_sglur") [node name="InteractArea2D" type="Area2D" parent="."] +position = Vector2(0, 21) [node name="CollisionShape2D" type="CollisionShape2D" parent="InteractArea2D"] -position = Vector2(0, 37) shape = SubResource("CircleShape2D_abrql") diff --git a/root.tscn b/root.tscn index 092edc9..1aa8b45 100644 --- a/root.tscn +++ b/root.tscn @@ -12,44 +12,45 @@ [node name="RootGui" parent="CanvasLayer" instance=ExtResource("1_jnlp7")] -[node name="Planet" parent="." instance=ExtResource("1_pyidc")] +[node name="Entities" type="Node2D" parent="."] +y_sort_enabled = true -[node name="Player" parent="." instance=ExtResource("2_vvh5c")] +[node name="Player" parent="Entities" instance=ExtResource("2_vvh5c")] + +[node name="DefaultPlant" parent="Entities" instance=ExtResource("4_28aoi")] +position = Vector2(195, 37) + +[node name="DefaultPlant2" parent="Entities" instance=ExtResource("4_28aoi")] +position = Vector2(114, -40) + +[node name="DefaultPlant3" parent="Entities" instance=ExtResource("4_28aoi")] +position = Vector2(-222, 138) + +[node name="DefaultPlant4" parent="Entities" instance=ExtResource("4_28aoi")] +position = Vector2(-186, -96) + +[node name="DefaultPlant5" parent="Entities" instance=ExtResource("4_28aoi")] +position = Vector2(-7, 150) + +[node name="DefaultPlant6" parent="Entities" instance=ExtResource("4_28aoi")] +position = Vector2(-19, -102) + +[node name="DefaultPlant7" parent="Entities" instance=ExtResource("4_28aoi")] +position = Vector2(-115, 50) + +[node name="DefaultPlant8" parent="Entities" instance=ExtResource("4_28aoi")] +position = Vector2(147, -173) + +[node name="DefaultPlant9" parent="Entities" instance=ExtResource("4_28aoi")] +position = Vector2(98, 90) + +[node name="DefaultPlant10" parent="Entities" instance=ExtResource("4_28aoi")] +position = Vector2(-269, 1) + +[node name="Planet" parent="." instance=ExtResource("1_pyidc")] [node name="Camera" parent="." node_paths=PackedStringArray("following") instance=ExtResource("3_vvh5c")] position = Vector2(2.22, 0) -following = NodePath("../Player") +following = NodePath("../Entities/Player") -[node name="TestPlants" type="Node2D" parent="."] - -[node name="DefaultPlant" parent="TestPlants" instance=ExtResource("4_28aoi")] -position = Vector2(195, 37) - -[node name="DefaultPlant2" parent="TestPlants" instance=ExtResource("4_28aoi")] -position = Vector2(114, -40) - -[node name="DefaultPlant3" parent="TestPlants" instance=ExtResource("4_28aoi")] -position = Vector2(-222, 138) - -[node name="DefaultPlant4" parent="TestPlants" instance=ExtResource("4_28aoi")] -position = Vector2(-186, -96) - -[node name="DefaultPlant5" parent="TestPlants" instance=ExtResource("4_28aoi")] -position = Vector2(-7, 150) - -[node name="DefaultPlant6" parent="TestPlants" instance=ExtResource("4_28aoi")] -position = Vector2(-19, -102) - -[node name="DefaultPlant7" parent="TestPlants" instance=ExtResource("4_28aoi")] -position = Vector2(-115, 50) - -[node name="DefaultPlant8" parent="TestPlants" instance=ExtResource("4_28aoi")] -position = Vector2(147, -173) - -[node name="DefaultPlant9" parent="TestPlants" instance=ExtResource("4_28aoi")] -position = Vector2(98, 90) - -[node name="DefaultPlant10" parent="TestPlants" instance=ExtResource("4_28aoi")] -position = Vector2(-269, 1) - -[connection signal="player_stats_updated" from="Player" to="CanvasLayer/RootGui" method="_on_player_player_stats_updated"] +[connection signal="player_stats_updated" from="Entities/Player" to="CanvasLayer/RootGui" method="_on_player_player_stats_updated"] diff --git a/stages/planet/planet.tscn b/stages/planet/planet.tscn index dc45d4c..2f414f1 100644 --- a/stages/planet/planet.tscn +++ b/stages/planet/planet.tscn @@ -5,4 +5,5 @@ [node name="Planet" type="Node2D"] [node name="SolGamejamNormal" type="Sprite2D" parent="."] +z_index = -1 texture = ExtResource("1_wb4p4")