diff --git a/src/Menus/DragNDrop/DragNDropUI.tscn b/src/Menus/DragNDrop/DragNDropUI.tscn index 907efa6..3f19aea 100644 --- a/src/Menus/DragNDrop/DragNDropUI.tscn +++ b/src/Menus/DragNDrop/DragNDropUI.tscn @@ -1,25 +1,49 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://Menus/DragNDrop/DragSource.tscn" type="PackedScene" id=1] [ext_resource path="res://Menus/DragNDrop/DragSink.tscn" type="PackedScene" id=2] [ext_resource path="res://Objects/Banana/Banana.tscn" type="PackedScene" id=3] +[ext_resource path="res://testSprites/bannane.png" type="Texture" id=4] +[ext_resource path="res://testSprites/falle.png" type="Texture" id=5] +[ext_resource path="res://Objects/Traps/bear.tscn" type="PackedScene" id=6] + +[sub_resource type="GDScript" id=1] +script/source = "extends Control + +export var ObjectParent:NodePath +" [node name="DragNDropUI" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 margin_left = -0.37735 margin_right = -0.37735 +script = SubResource( 1 ) __meta__ = { "_edit_use_anchors_": false } -[node name="DragSource" parent="." instance=ExtResource( 1 )] -margin_left = 12.7532 -margin_top = 230.124 -margin_right = 44.7532 -margin_bottom = 262.124 +[node name="DragSourceBanana" parent="." instance=ExtResource( 1 )] +margin_left = 13.5128 +margin_top = 238.668 +margin_right = 45.5128 +margin_bottom = 270.668 +texture = ExtResource( 4 ) Item = ExtResource( 3 ) +PreviewIcon = ExtResource( 4 ) + +[node name="DragSourceFalle" parent="." instance=ExtResource( 1 )] +margin_left = 45.5128 +margin_top = 238.668 +margin_right = 77.5128 +margin_bottom = 270.668 +texture = ExtResource( 5 ) +Item = ExtResource( 6 ) +PreviewIcon = ExtResource( 5 ) [node name="DragSink" parent="." instance=ExtResource( 2 )] -margin_left = 1.19746 -margin_right = 1.19745 +anchor_right = 1.002 +anchor_bottom = 0.87 +margin_left = 1.0 +margin_right = 0.0399475 +margin_bottom = 0.0999756 diff --git a/src/Menus/DragNDrop/DragSink.tscn b/src/Menus/DragNDrop/DragSink.tscn index e7e9423..4711e2a 100644 --- a/src/Menus/DragNDrop/DragSink.tscn +++ b/src/Menus/DragNDrop/DragSink.tscn @@ -4,6 +4,7 @@ script/source = "extends Container #DropZone + #stuff can be dropped here func can_drop_data(_pos, data): return typeof(data) == typeof(PackedScene) @@ -12,7 +13,7 @@ func can_drop_data(_pos, data): func drop_data(_pos, data:PackedScene): var child = data.instance() child.position= _pos - self.add_child(child) + get_node(get_parent().ObjectParent).add_child(child) " [node name="DragSink" type="Container"] diff --git a/src/Menus/Sounds/menu_slider1.ogg b/src/Menus/Sounds/menu_slider1.ogg new file mode 100644 index 0000000..cb9cf91 Binary files /dev/null and b/src/Menus/Sounds/menu_slider1.ogg differ diff --git a/src/Menus/Sounds/menu_slider1.ogg.import b/src/Menus/Sounds/menu_slider1.ogg.import new file mode 100644 index 0000000..f348df4 --- /dev/null +++ b/src/Menus/Sounds/menu_slider1.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/menu_slider1.ogg-35df765e7d7998b5a6162c41b4a229e2.oggstr" + +[deps] + +source_file="res://Menus/Sounds/menu_slider1.ogg" +dest_files=[ "res://.import/menu_slider1.ogg-35df765e7d7998b5a6162c41b4a229e2.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/src/Menus/Sounds/menu_slider2.ogg b/src/Menus/Sounds/menu_slider2.ogg new file mode 100644 index 0000000..de1ba0f Binary files /dev/null and b/src/Menus/Sounds/menu_slider2.ogg differ diff --git a/src/Menus/Sounds/menu_slider2.ogg.import b/src/Menus/Sounds/menu_slider2.ogg.import new file mode 100644 index 0000000..cd97e3b --- /dev/null +++ b/src/Menus/Sounds/menu_slider2.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/menu_slider2.ogg-b2a698a7a30a0a4e4c29e9f29b5b7435.oggstr" + +[deps] + +source_file="res://Menus/Sounds/menu_slider2.ogg" +dest_files=[ "res://.import/menu_slider2.ogg-b2a698a7a30a0a4e4c29e9f29b5b7435.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/src/Menus/Sounds/menu_slider3.ogg b/src/Menus/Sounds/menu_slider3.ogg new file mode 100644 index 0000000..ced31e2 Binary files /dev/null and b/src/Menus/Sounds/menu_slider3.ogg differ diff --git a/src/Menus/Sounds/menu_slider3.ogg.import b/src/Menus/Sounds/menu_slider3.ogg.import new file mode 100644 index 0000000..499133f --- /dev/null +++ b/src/Menus/Sounds/menu_slider3.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/menu_slider3.ogg-a3cde724c66919d1cabbaa1ccadfedf2.oggstr" + +[deps] + +source_file="res://Menus/Sounds/menu_slider3.ogg" +dest_files=[ "res://.import/menu_slider3.ogg-a3cde724c66919d1cabbaa1ccadfedf2.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/src/Player/Sounds/hero_laugh1.ogg b/src/Player/Sounds/hero_laugh1.ogg new file mode 100644 index 0000000..a35a9eb Binary files /dev/null and b/src/Player/Sounds/hero_laugh1.ogg differ diff --git a/src/Player/Sounds/hero_laugh1.ogg.import b/src/Player/Sounds/hero_laugh1.ogg.import new file mode 100644 index 0000000..ba29a5b --- /dev/null +++ b/src/Player/Sounds/hero_laugh1.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/hero_laugh1.ogg-7dec7ac554ba9c656df4c0a3b9f9ae70.oggstr" + +[deps] + +source_file="res://Player/Sounds/hero_laugh1.ogg" +dest_files=[ "res://.import/hero_laugh1.ogg-7dec7ac554ba9c656df4c0a3b9f9ae70.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/src/Player/Sounds/hero_laugh2.ogg b/src/Player/Sounds/hero_laugh2.ogg new file mode 100644 index 0000000..b41f4b8 Binary files /dev/null and b/src/Player/Sounds/hero_laugh2.ogg differ diff --git a/src/Player/Sounds/hero_laugh2.ogg.import b/src/Player/Sounds/hero_laugh2.ogg.import new file mode 100644 index 0000000..cd500c7 --- /dev/null +++ b/src/Player/Sounds/hero_laugh2.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/hero_laugh2.ogg-a275c70549ae553d0e85acd0735c97df.oggstr" + +[deps] + +source_file="res://Player/Sounds/hero_laugh2.ogg" +dest_files=[ "res://.import/hero_laugh2.ogg-a275c70549ae553d0e85acd0735c97df.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/src/Player/Sounds/sword1.ogg b/src/Player/Sounds/sword1.ogg new file mode 100644 index 0000000..3bd26e5 Binary files /dev/null and b/src/Player/Sounds/sword1.ogg differ diff --git a/src/Player/Sounds/sword1.ogg.import b/src/Player/Sounds/sword1.ogg.import new file mode 100644 index 0000000..8247945 --- /dev/null +++ b/src/Player/Sounds/sword1.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/sword1.ogg-0cb6c377d883664dabc3ce1f29fb4b4c.oggstr" + +[deps] + +source_file="res://Player/Sounds/sword1.ogg" +dest_files=[ "res://.import/sword1.ogg-0cb6c377d883664dabc3ce1f29fb4b4c.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/src/Player/Sounds/sword2.ogg b/src/Player/Sounds/sword2.ogg new file mode 100644 index 0000000..f6cf29a Binary files /dev/null and b/src/Player/Sounds/sword2.ogg differ diff --git a/src/Player/Sounds/sword2.ogg.import b/src/Player/Sounds/sword2.ogg.import new file mode 100644 index 0000000..b3ced55 --- /dev/null +++ b/src/Player/Sounds/sword2.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/sword2.ogg-86708f3a6db18433346c1c1e70fc794c.oggstr" + +[deps] + +source_file="res://Player/Sounds/sword2.ogg" +dest_files=[ "res://.import/sword2.ogg-86708f3a6db18433346c1c1e70fc794c.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/src/Player/Sounds/sword3.ogg b/src/Player/Sounds/sword3.ogg new file mode 100644 index 0000000..39284b6 Binary files /dev/null and b/src/Player/Sounds/sword3.ogg differ diff --git a/src/Player/Sounds/sword3.ogg.import b/src/Player/Sounds/sword3.ogg.import new file mode 100644 index 0000000..71be4ef --- /dev/null +++ b/src/Player/Sounds/sword3.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/sword3.ogg-aba8e1a09318ce30f077322447a7f724.oggstr" + +[deps] + +source_file="res://Player/Sounds/sword3.ogg" +dest_files=[ "res://.import/sword3.ogg-aba8e1a09318ce30f077322447a7f724.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/src/Player/Sounds/sword4.ogg b/src/Player/Sounds/sword4.ogg new file mode 100644 index 0000000..59d7edb Binary files /dev/null and b/src/Player/Sounds/sword4.ogg differ diff --git a/src/Player/Sounds/sword4.ogg.import b/src/Player/Sounds/sword4.ogg.import new file mode 100644 index 0000000..83eeda3 --- /dev/null +++ b/src/Player/Sounds/sword4.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/sword4.ogg-e175f4e5f038794fb7d38318b3ba2010.oggstr" + +[deps] + +source_file="res://Player/Sounds/sword4.ogg" +dest_files=[ "res://.import/sword4.ogg-e175f4e5f038794fb7d38318b3ba2010.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/src/Player/Sounds/sword5.ogg b/src/Player/Sounds/sword5.ogg new file mode 100644 index 0000000..8945d92 Binary files /dev/null and b/src/Player/Sounds/sword5.ogg differ diff --git a/src/Player/Sounds/sword5.ogg.import b/src/Player/Sounds/sword5.ogg.import new file mode 100644 index 0000000..eaa47dc --- /dev/null +++ b/src/Player/Sounds/sword5.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/sword5.ogg-53125f0a58e369e0b1241054eff7ca8b.oggstr" + +[deps] + +source_file="res://Player/Sounds/sword5.ogg" +dest_files=[ "res://.import/sword5.ogg-53125f0a58e369e0b1241054eff7ca8b.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/src/World.tscn b/src/World.tscn index b6e9c47..e23fca5 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -137,6 +137,12 @@ __meta__ = { [node name="DialogueBox" parent="CenterContainer" instance=ExtResource( 19 )] anchor_right = 0.0 anchor_bottom = 0.0 +[node name="CanvasLayer" type="CanvasLayer" parent="."] + +[node name="DragNDropUI" parent="CanvasLayer" instance=ExtResource( 19 )] +margin_left = 0.0 +margin_right = 0.0 +ObjectParent = NodePath("../..") [editable path="YSort/minion"]