diff options
| author | juneflow <63904206+juneflow@users.noreply.github.com> | 2020-04-18 19:52:21 +0200 |
|---|---|---|
| committer | juneflow <63904206+juneflow@users.noreply.github.com> | 2020-04-18 19:52:21 +0200 |
| commit | c5d0c875e1e622fe897390ab745b283756fc3336 (patch) | |
| tree | badddb47ae93ae6da7accf123a26b19b53de8f8a /main_scene | |
| parent | 255475d35b954d442a79fd937dfaf395204cf639 (diff) | |
| parent | c94bcec15175b363057c9701481512b6d9b9dfdf (diff) | |
| download | LDJam46-c5d0c875e1e622fe897390ab745b283756fc3336.tar.gz LDJam46-c5d0c875e1e622fe897390ab745b283756fc3336.tar.bz2 LDJam46-c5d0c875e1e622fe897390ab745b283756fc3336.zip | |
Merge branch 'master' of https://github.com/romangraef/LDJam46
Diffstat (limited to 'main_scene')
| -rw-r--r-- | main_scene/management.tscn | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main_scene/management.tscn b/main_scene/management.tscn index 63dc13d..398f2ea 100644 --- a/main_scene/management.tscn +++ b/main_scene/management.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=12 format=2] [ext_resource path="res://assets/background.png" type="Texture" id=1] [ext_resource path="res://main_scene/coffee_machine.gd" type="Script" id=2] @@ -8,6 +8,7 @@ [ext_resource path="res://main_scene/hire_button.gd" type="Script" id=6] [ext_resource path="res://main_scene/programmers.gd" type="Script" id=7] [ext_resource path="res://assets/coffee_maschine.png" type="Texture" id=8] +[ext_resource path="res://upgrades/upgrades.tscn" type="PackedScene" id=9] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 70.4574, 120 ) @@ -57,3 +58,5 @@ script = ExtResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="coffee_maschine/Area2D"] position = Vector2( -40.0001, -0.00012207 ) shape = SubResource( 2 ) + +[node name="upgrades" parent="." instance=ExtResource( 9 )] |