From 3f5dbe5528843a240395471af78750b4f980ecd1 Mon Sep 17 00:00:00 2001
From: Jan Schuffenhauer <explorerkiller@gmail.com>
Date: Mon, 20 Apr 2020 21:47:42 +0200
Subject: [PATCH] Fixed ot again

---
 src/Menus/DragNDrop/DragNDropUI.tscn | 36 ++++++++++++----------------
 src/World.tscn                       |  2 +-
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/Menus/DragNDrop/DragNDropUI.tscn b/src/Menus/DragNDrop/DragNDropUI.tscn
index 884236c..f2c460c 100644
--- a/src/Menus/DragNDrop/DragNDropUI.tscn
+++ b/src/Menus/DragNDrop/DragNDropUI.tscn
@@ -1,11 +1,7 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://Objects/Traps/Spike/SpikeCard.tscn" type="PackedScene" id=1]
 [ext_resource path="res://Menus/DragNDrop/DragSink.tscn" type="PackedScene" id=2]
 [ext_resource path="res://Objects/Traps/Flame/FlameCard.tscn" type="PackedScene" id=3]
-[ext_resource path="res://Objects/Traps/Bear/BearCard.tscn" type="PackedScene" id=4]
-[ext_resource path="res://Objects/Barriere/BarrierCard.tscn" type="PackedScene" id=5]
-[ext_resource path="res://Objects/Barrel/BarrelCard.tscn" type="PackedScene" id=6]
 [ext_resource path="res://Menus/DragNDrop/DragNDropUI.gd" type="Script" id=8]
 
 [node name="DragNDropUI" type="Control"]
@@ -18,12 +14,6 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="GenericCard2" parent="." instance=ExtResource( 4 )]
-
-[node name="GenericCard3" parent="." instance=ExtResource( 5 )]
-
-[node name="GenericCard4" parent="." instance=ExtResource( 6 )]
-
 [node name="DragSink" parent="." instance=ExtResource( 2 )]
 anchor_right = 1.002
 anchor_bottom = 0.87
@@ -31,14 +21,18 @@ margin_left = 2.0
 margin_right = 0.0400085
 margin_bottom = -30.9
 
-[node name="SpikeCard" parent="." instance=ExtResource( 1 )]
-margin_left = 236.922
-margin_top = 221.453
-margin_right = 268.922
-margin_bottom = 253.453
+[node name="HBoxContainer" type="HBoxContainer" parent="."]
+margin_left = 17.5188
+margin_top = 220.946
+margin_right = 57.5188
+margin_bottom = 260.946
+custom_constants/separation = 60
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
-[node name="FlameCard" parent="." instance=ExtResource( 3 )]
-margin_left = 12.6684
-margin_top = 221.458
-margin_right = 44.6684
-margin_bottom = 253.458
+[node name="FlameCard" parent="HBoxContainer" instance=ExtResource( 3 )]
+margin_left = 0.0
+margin_top = 0.0
+margin_right = 0.0
+margin_bottom = 40.0
diff --git a/src/World.tscn b/src/World.tscn
index fcab27e..a7d920e 100644
--- a/src/World.tscn
+++ b/src/World.tscn
@@ -23,7 +23,7 @@ HeroTemplate = ExtResource( 1 )
 
 [node name="Background" parent="." instance=ExtResource( 7 )]
 pause_mode = 1
-frame = 49
+frame = 36
 
 [node name="FloorTileMap" type="TileMap" parent="."]
 pause_mode = 1