diff --git a/project.godot b/project.godot index 3a99c34..61c5cb7 100644 --- a/project.godot +++ b/project.godot @@ -48,7 +48,7 @@ version_control_plugin_name="GitAPI" [gdnative] -singletons=[ ] +singletons=[ "res://addons/godot-git-plugin/git_api.gdnlib" ] [global] diff --git a/src/scenes/game/Game.tscn b/src/scenes/game/Game.tscn index d9a0c9e..2065621 100644 --- a/src/scenes/game/Game.tscn +++ b/src/scenes/game/Game.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=17 format=2] +[gd_scene load_steps=18 format=2] [ext_resource path="res://src/scenes/menu/background/background.png" type="Texture" id=1] [ext_resource path="res://src/scenes/game/sprites/background_houses.png" type="Texture" id=2] @@ -12,6 +12,7 @@ [ext_resource path="res://icon.png" type="Texture" id=10] [ext_resource path="res://src/scenes/game/game.gd" type="Script" id=11] [ext_resource path="res://src/scenes/game/sprites/ui_background.png" type="Texture" id=12] +[ext_resource path="res://src/models/enemies/trash_can/TrashCan.tscn" type="PackedScene" id=13] [sub_resource type="RectangleShape2D" id=2] extents = Vector2( 10, 60 ) @@ -44,35 +45,39 @@ centered = false region_enabled = true region_rect = Rect2( 0, 0, 320, 180 ) +[node name="Houses" type="StaticBody2D" parent="View/Background"] +z_index = 1 + +[node name="Sprite" type="Sprite" parent="View/Background/Houses"] +texture = ExtResource( 2 ) +centered = false + +[node name="CollisionShape2D" type="CollisionShape2D" parent="View/Background/Houses"] +position = Vector2( 10, 60 ) +shape = SubResource( 2 ) + +[node name="CollisionShape2D2" type="CollisionShape2D" parent="View/Background/Houses"] +position = Vector2( 310, 60 ) +shape = SubResource( 2 ) + +[node name="CollisionShape2D3" type="CollisionShape2D" parent="View/Background/Houses"] +position = Vector2( 160, 10.25 ) +shape = SubResource( 3 ) + +[node name="CollisionShape2D4" type="CollisionShape2D" parent="View/Background/Houses"] +position = Vector2( 160, 109.875 ) +shape = SubResource( 3 ) + +[node name="TrashCan" parent="View" instance=ExtResource( 13 )] + [node name="Player" parent="View" instance=ExtResource( 5 )] position = Vector2( 46, 42 ) +z_index = 1 [node name="UI" type="Control" parent="."] margin_right = 40.0 margin_bottom = 40.0 -[node name="Houses" type="StaticBody2D" parent="UI"] - -[node name="Sprite" type="Sprite" parent="UI/Houses"] -texture = ExtResource( 2 ) -centered = false - -[node name="CollisionShape2D" type="CollisionShape2D" parent="UI/Houses"] -position = Vector2( 10, 60 ) -shape = SubResource( 2 ) - -[node name="CollisionShape2D2" type="CollisionShape2D" parent="UI/Houses"] -position = Vector2( 310, 60 ) -shape = SubResource( 2 ) - -[node name="CollisionShape2D3" type="CollisionShape2D" parent="UI/Houses"] -position = Vector2( 160, 10.25 ) -shape = SubResource( 3 ) - -[node name="CollisionShape2D4" type="CollisionShape2D" parent="UI/Houses"] -position = Vector2( 160, 109.875 ) -shape = SubResource( 3 ) - [node name="Background" type="TextureRect" parent="UI"] margin_top = 120.0 margin_right = 320.0