From f470b57b715db241709b684df59d41d91709bbb3 Mon Sep 17 00:00:00 2001 From: Jan Schuffenhauer Date: Sun, 19 Apr 2020 18:37:01 +0200 Subject: [PATCH] Some Testing done and drop down fixed --- src/World.tscn | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/World.tscn b/src/World.tscn index 03c7346..673d9cd 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=11 format=2] [ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1] [ext_resource path="res://World.gd" type="Script" id=2] @@ -6,6 +6,8 @@ [ext_resource path="res://testSprites/dark.png" type="Texture" id=4] [ext_resource path="res://Menus/DragNDrop/DragNDropUI.tscn" type="PackedScene" id=5] [ext_resource path="res://Menus/DialogueBox/DialogueBox.tscn" type="PackedScene" id=6] +[ext_resource path="res://Boss/Boss_template.tscn" type="PackedScene" id=7] +[ext_resource path="res://Objects/Bonfire/Bonfire.tscn" type="PackedScene" id=8] [ext_resource path="res://Maps/Grid.tscn" type="PackedScene" id=18] [sub_resource type="AnimationNodeStateMachinePlayback" id=1] @@ -14,7 +16,7 @@ script = ExtResource( 2 ) [node name="WallSprite" type="Sprite" parent="."] -position = Vector2( 357.587, 175.62 ) +position = Vector2( 355.382, 175.62 ) texture = ExtResource( 4 ) region_enabled = true region_rect = Rect2( 0, 0, 1280, 720 ) @@ -42,12 +44,20 @@ FRICTION = 200 [node name="AnimationTree" parent="YSort/Player" index="4"] parameters/playback = SubResource( 1 ) -[node name="Grid" parent="." instance=ExtResource( 18 )] +[node name="Boss_template" parent="YSort" instance=ExtResource( 7 )] +position = Vector2( -67.0889, 2.27742 ) + +[node name="Bonfire" parent="YSort" instance=ExtResource( 8 )] +position = Vector2( 214.647, -24.9932 ) [node name="CanvasLayer" type="CanvasLayer" parent="."] -[node name="DragNDropUI" parent="CanvasLayer" instance=ExtResource( 5 )] - [node name="DialogueBox" parent="CanvasLayer" instance=ExtResource( 6 )] +visible = false + +[node name="DragNDropUI" parent="CanvasLayer" instance=ExtResource( 5 )] +ObjectParent = NodePath("../..") + +[node name="Grid" parent="." instance=ExtResource( 18 )] [editable path="YSort/Player"]