diff --git a/src/Menus/DragNDrop/DragNDropUI.gd b/src/Menus/DragNDrop/DragNDropUI.gd new file mode 100644 index 0000000..197b207 --- /dev/null +++ b/src/Menus/DragNDrop/DragNDropUI.gd @@ -0,0 +1,3 @@ +extends Control + +export var ObjectParent:NodePath diff --git a/src/Menus/DragNDrop/DragNDropUI.tscn b/src/Menus/DragNDrop/DragNDropUI.tscn index 3f19aea..52f2bde 100644 --- a/src/Menus/DragNDrop/DragNDropUI.tscn +++ b/src/Menus/DragNDrop/DragNDropUI.tscn @@ -1,49 +1,63 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=9 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/bear.jpg" 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 -" +[ext_resource path="res://Objects/Traps/Bear/Animation/0012.png" type="Texture" id=7] +[ext_resource path="res://Menus/DragNDrop/DragNDropUI.gd" type="Script" id=8] [node name="DragNDropUI" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 margin_left = -0.37735 margin_right = -0.37735 -script = SubResource( 1 ) +script = ExtResource( 8 ) __meta__ = { "_edit_use_anchors_": false } -[node name="DragSourceBanana" parent="." instance=ExtResource( 1 )] -margin_left = 13.5128 -margin_top = 238.668 -margin_right = 45.5128 -margin_bottom = 270.668 +[node name="GenericCard1" parent="." instance=ExtResource( 1 )] +margin_left = 11.9239 +margin_top = 220.793 +margin_right = 43.9239 +margin_bottom = 252.793 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 +[node name="GenericCard2" parent="." instance=ExtResource( 1 )] +margin_left = 69.0145 +margin_top = 221.191 +margin_right = 101.014 +margin_bottom = 253.191 texture = ExtResource( 5 ) Item = ExtResource( 6 ) -PreviewIcon = ExtResource( 5 ) +PreviewIcon = ExtResource( 7 ) + +[node name="GenericCard3" parent="." instance=ExtResource( 1 )] +margin_left = 124.812 +margin_top = 220.859 +margin_right = 156.812 +margin_bottom = 252.859 + +[node name="GenericCard4" parent="." instance=ExtResource( 1 )] +margin_left = 180.718 +margin_top = 220.859 +margin_right = 212.718 +margin_bottom = 252.859 + +[node name="GenericCard5" parent="." instance=ExtResource( 1 )] +margin_left = 237.404 +margin_top = 221.267 +margin_right = 269.404 +margin_bottom = 253.267 [node name="DragSink" parent="." instance=ExtResource( 2 )] anchor_right = 1.002 anchor_bottom = 0.87 -margin_left = 1.0 -margin_right = 0.0399475 -margin_bottom = 0.0999756 +margin_left = 2.0 +margin_right = 0.0400085 +margin_bottom = -30.9 diff --git a/src/Menus/DragNDrop/DragSink.gd b/src/Menus/DragNDrop/DragSink.gd new file mode 100644 index 0000000..9642816 --- /dev/null +++ b/src/Menus/DragNDrop/DragSink.gd @@ -0,0 +1,30 @@ +extends Container + +const Grid = preload("res://Maps/Grid.gd") +onready var grid = get_tree().current_scene.get_node("Grid") +onready var ysort = get_tree().current_scene.get_node("YSort") + +#DropZone +#stuff can be dropped here +func can_drop_data(_pos, data): + return typeof(data) == typeof(PackedScene) + + +func get_nearest_grid_pos(position): + return Vector2(round(position.x / 32.0), round(position.y / 32.0)) + + +func get_nearest_global_pos(position): + return Vector2(round(position.x / 32.0) * 32, round(position.y / 32.0) * 32) + + +#what is to be done when data is dropped +func drop_data(_pos, data:PackedScene): + var new_pos = get_nearest_grid_pos(_pos) + + if grid.object_grid[new_pos.x - 1][new_pos.y - 1].back() == Grid.Kind.FIELD: + var child = data.instance() + child.position = get_nearest_global_pos(_pos) + + ysort.add_child(child) + grid._update_grid() diff --git a/src/Menus/DragNDrop/DragSink.tscn b/src/Menus/DragNDrop/DragSink.tscn index 4711e2a..0e0a1df 100644 --- a/src/Menus/DragNDrop/DragSink.tscn +++ b/src/Menus/DragNDrop/DragSink.tscn @@ -1,26 +1,12 @@ [gd_scene load_steps=2 format=2] -[sub_resource type="GDScript" id=1] -script/source = "extends Container -#DropZone - - -#stuff can be dropped here -func can_drop_data(_pos, data): - return typeof(data) == typeof(PackedScene) - -#what is to be done when data is dropped -func drop_data(_pos, data:PackedScene): - var child = data.instance() - child.position= _pos - get_node(get_parent().ObjectParent).add_child(child) -" +[ext_resource path="res://Menus/DragNDrop/DragSink.gd" type="Script" id=1] [node name="DragSink" type="Container"] anchor_right = 1.0 anchor_bottom = 0.789 margin_bottom = -0.0200043 -script = SubResource( 1 ) +script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } diff --git a/src/Menus/DragNDrop/DragSource.gd b/src/Menus/DragNDrop/DragSource.gd new file mode 100644 index 0000000..82615e1 --- /dev/null +++ b/src/Menus/DragNDrop/DragSource.gd @@ -0,0 +1,36 @@ +extends TextureRect +#CardDeck +export var Item:PackedScene +export var PreviewIcon:Texture +export var DeleteOnGrab:bool = false + +#if a drag is initiated here +func get_drag_data(_pos): + var ctrl = Control.new() + var TR = TextureRect.new() + TR.texture = get_resized_texture(PreviewIcon,self.rect_size[0],self.rect_size[1]) + TR.rect_size= self.rect_size + TR.set_position(_pos*-1,false) + ctrl.add_child(TR) + set_drag_preview(ctrl) + + if DeleteOnGrab : + self.queue_free() + return Item + +#stuff can be dropped here +#eg you picked the wrong thing up, let go and it returns to nothingness +func can_drop_data(_pos, data): + return typeof(data) == typeof(PackedScene) + +#do nothing if stuff is dropped here +func drop_data(_pos, _data): + pass + +func get_resized_texture(t: Texture, width: int = 0, height: int = 0): + var image = t.get_data() + if width > 0 && height > 0: + image.resize(width, height) + var itex = ImageTexture.new() + itex.create_from_image(image,0) + return itex diff --git a/src/Menus/DragNDrop/DragSource.tscn b/src/Menus/DragNDrop/DragSource.tscn index 8ec97c3..6070ea3 100644 --- a/src/Menus/DragNDrop/DragSource.tscn +++ b/src/Menus/DragNDrop/DragSource.tscn @@ -1,45 +1,8 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://icon.png" type="Texture" id=1] - -[sub_resource type="GDScript" id=1] -script/source = "extends TextureRect -#CardDeck -export var Item:PackedScene -export var PreviewIcon:Texture -export var DeleteOnGrab:bool = false - -#if a drag is initiated here -func get_drag_data(_pos): - var ctrl = Control.new() - var TR = TextureRect.new() - TR.texture = get_resized_texture(PreviewIcon,self.rect_size[0],self.rect_size[1]) - TR.rect_size= self.rect_size - TR.set_position(_pos*-1,false) - ctrl.add_child(TR) - set_drag_preview(ctrl) - - if DeleteOnGrab : - self.queue_free() - return Item - -#stuff can be dropped here -#eg you picked the wrong thing up, let go and it returns to nothingness -func can_drop_data(_pos, data): - return typeof(data) == typeof(PackedScene) - -#do nothing if stuff is dropped here -func drop_data(_pos, _data): - pass - -func get_resized_texture(t: Texture, width: int = 0, height: int = 0): - var image = t.get_data() - if width > 0 && height > 0: - image.resize(width, height) - var itex = ImageTexture.new() - itex.create_from_image(image,0) - return itex -" +[ext_resource path="res://Objects/Card/card.png" type="Texture" id=2] +[ext_resource path="res://Menus/DragNDrop/DragSource.gd" type="Script" id=3] [node name="DragSource" type="TextureRect"] margin_left = 10.7364 @@ -48,8 +11,12 @@ margin_right = 42.7364 margin_bottom = 259.792 texture = ExtResource( 1 ) expand = true -script = SubResource( 1 ) +script = ExtResource( 3 ) __meta__ = { "_edit_use_anchors_": false } -PreviewIcon = ExtResource( 1 ) + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 16.0791, 16.0117 ) +z_index = -1 +texture = ExtResource( 2 ) diff --git a/src/Menus/TitleScreen/TitleScreen.tscn b/src/Menus/TitleScreen/TitleScreen.tscn index 9904196..83cd783 100644 --- a/src/Menus/TitleScreen/TitleScreen.tscn +++ b/src/Menus/TitleScreen/TitleScreen.tscn @@ -161,9 +161,9 @@ anchor_top = -0.003002 anchor_right = 0.704 anchor_bottom = 0.667 margin_left = 0.810538 -margin_top = -0.18946 +margin_top = 0.81054 margin_right = 0.0802612 -margin_bottom = -0.0900574 +margin_bottom = 0.909943 script = ExtResource( 3 ) __meta__ = { "_edit_use_anchors_": false @@ -174,7 +174,7 @@ anims/__INIT__ = SubResource( 1 ) anims/show_buttons = SubResource( 2 ) [node name="Startup" parent="." instance=ExtResource( 2 )] -scale = Vector2( 1.50207, 1.49479 ) +scale = Vector2( 1.5, 1.5 ) animation = "start" speed_scale = 1.0 diff --git a/src/Objects/Card/card.png b/src/Objects/Card/card.png new file mode 100644 index 0000000..d1adef1 Binary files /dev/null and b/src/Objects/Card/card.png differ diff --git a/src/Objects/Card/card.png.import b/src/Objects/Card/card.png.import new file mode 100644 index 0000000..917494c --- /dev/null +++ b/src/Objects/Card/card.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/card.png-8a52ea3fcf2334957e1af908bdd85da3.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Card/card.png" +dest_files=[ "res://.import/card.png-8a52ea3fcf2334957e1af908bdd85da3.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0000.png b/src/Objects/Traps/Bear/Animation/0000.png new file mode 100644 index 0000000..acbaaca Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0000.png differ diff --git a/src/Objects/Traps/Bear/Animation/0000.png.import b/src/Objects/Traps/Bear/Animation/0000.png.import new file mode 100644 index 0000000..7988502 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0000.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0000.png-e5c5f98ec59a6fd31ffa2e1d60f9b1d1.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0000.png" +dest_files=[ "res://.import/0000.png-e5c5f98ec59a6fd31ffa2e1d60f9b1d1.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0001.png b/src/Objects/Traps/Bear/Animation/0001.png new file mode 100644 index 0000000..38f2340 Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0001.png differ diff --git a/src/Objects/Traps/Bear/Animation/0001.png.import b/src/Objects/Traps/Bear/Animation/0001.png.import new file mode 100644 index 0000000..f7e0b84 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0001.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0001.png-9df81f407fe3c1b9eac508724033e047.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0001.png" +dest_files=[ "res://.import/0001.png-9df81f407fe3c1b9eac508724033e047.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0002.png b/src/Objects/Traps/Bear/Animation/0002.png new file mode 100644 index 0000000..fd26e6d Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0002.png differ diff --git a/src/Objects/Traps/Bear/Animation/0002.png.import b/src/Objects/Traps/Bear/Animation/0002.png.import new file mode 100644 index 0000000..9f72235 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0002.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0002.png-cdc077fcfefba2748cca713f9bd2d611.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0002.png" +dest_files=[ "res://.import/0002.png-cdc077fcfefba2748cca713f9bd2d611.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0003.png b/src/Objects/Traps/Bear/Animation/0003.png new file mode 100644 index 0000000..09aad9d Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0003.png differ diff --git a/src/Objects/Traps/Bear/Animation/0003.png.import b/src/Objects/Traps/Bear/Animation/0003.png.import new file mode 100644 index 0000000..30b7326 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0003.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0003.png-c5202fe83ab1e0e183e79cf57b581217.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0003.png" +dest_files=[ "res://.import/0003.png-c5202fe83ab1e0e183e79cf57b581217.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0004.png b/src/Objects/Traps/Bear/Animation/0004.png new file mode 100644 index 0000000..c55b8cd Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0004.png differ diff --git a/src/Objects/Traps/Bear/Animation/0004.png.import b/src/Objects/Traps/Bear/Animation/0004.png.import new file mode 100644 index 0000000..fd89c53 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0004.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0004.png-6f18a07b50945b6208cec35706e344d2.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0004.png" +dest_files=[ "res://.import/0004.png-6f18a07b50945b6208cec35706e344d2.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0005.png b/src/Objects/Traps/Bear/Animation/0005.png new file mode 100644 index 0000000..0fa075b Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0005.png differ diff --git a/src/Objects/Traps/Bear/Animation/0005.png.import b/src/Objects/Traps/Bear/Animation/0005.png.import new file mode 100644 index 0000000..2e9a7fa --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0005.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0005.png-aa9a9d018316b2589b474bd0cf29c5e8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0005.png" +dest_files=[ "res://.import/0005.png-aa9a9d018316b2589b474bd0cf29c5e8.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0006.png b/src/Objects/Traps/Bear/Animation/0006.png new file mode 100644 index 0000000..519ff3f Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0006.png differ diff --git a/src/Objects/Traps/Bear/Animation/0006.png.import b/src/Objects/Traps/Bear/Animation/0006.png.import new file mode 100644 index 0000000..3c4dc0f --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0006.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0006.png-4bb618801f5290b92956a677da7ea797.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0006.png" +dest_files=[ "res://.import/0006.png-4bb618801f5290b92956a677da7ea797.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0007.png b/src/Objects/Traps/Bear/Animation/0007.png new file mode 100644 index 0000000..0a54d49 Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0007.png differ diff --git a/src/Objects/Traps/Bear/Animation/0007.png.import b/src/Objects/Traps/Bear/Animation/0007.png.import new file mode 100644 index 0000000..0219be7 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0007.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0007.png-d2fe9b929e010cc9785024ef9b453a34.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0007.png" +dest_files=[ "res://.import/0007.png-d2fe9b929e010cc9785024ef9b453a34.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0008.png b/src/Objects/Traps/Bear/Animation/0008.png new file mode 100644 index 0000000..4fba1a5 Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0008.png differ diff --git a/src/Objects/Traps/Bear/Animation/0008.png.import b/src/Objects/Traps/Bear/Animation/0008.png.import new file mode 100644 index 0000000..d310e70 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0008.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0008.png-4338ecdb194e3f5f3414a4903fe6eadc.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0008.png" +dest_files=[ "res://.import/0008.png-4338ecdb194e3f5f3414a4903fe6eadc.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0009.png b/src/Objects/Traps/Bear/Animation/0009.png new file mode 100644 index 0000000..890ccff Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0009.png differ diff --git a/src/Objects/Traps/Bear/Animation/0009.png.import b/src/Objects/Traps/Bear/Animation/0009.png.import new file mode 100644 index 0000000..26bde12 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0009.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0009.png-fa8a4a997670106a5af208b30c868a60.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0009.png" +dest_files=[ "res://.import/0009.png-fa8a4a997670106a5af208b30c868a60.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0010.png b/src/Objects/Traps/Bear/Animation/0010.png new file mode 100644 index 0000000..7b03d32 Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0010.png differ diff --git a/src/Objects/Traps/Bear/Animation/0010.png.import b/src/Objects/Traps/Bear/Animation/0010.png.import new file mode 100644 index 0000000..5e9260d --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0010.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0010.png-10fea65c7ececd4604497b6742b51211.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0010.png" +dest_files=[ "res://.import/0010.png-10fea65c7ececd4604497b6742b51211.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0011.png b/src/Objects/Traps/Bear/Animation/0011.png new file mode 100644 index 0000000..fd6be35 Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0011.png differ diff --git a/src/Objects/Traps/Bear/Animation/0011.png.import b/src/Objects/Traps/Bear/Animation/0011.png.import new file mode 100644 index 0000000..bb13061 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0011.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0011.png-4f301b1d8e7f1cae78ad0014938d0257.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0011.png" +dest_files=[ "res://.import/0011.png-4f301b1d8e7f1cae78ad0014938d0257.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0012.png b/src/Objects/Traps/Bear/Animation/0012.png new file mode 100644 index 0000000..53b6c39 Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0012.png differ diff --git a/src/Objects/Traps/Bear/Animation/0012.png.import b/src/Objects/Traps/Bear/Animation/0012.png.import new file mode 100644 index 0000000..8caea5f --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0012.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0012.png-cfe58ded128267406038238dcc1e541a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0012.png" +dest_files=[ "res://.import/0012.png-cfe58ded128267406038238dcc1e541a.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0013.png b/src/Objects/Traps/Bear/Animation/0013.png new file mode 100644 index 0000000..2ffb044 Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0013.png differ diff --git a/src/Objects/Traps/Bear/Animation/0013.png.import b/src/Objects/Traps/Bear/Animation/0013.png.import new file mode 100644 index 0000000..c9bbe94 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0013.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0013.png-d3699fa27fdabac3d0a7804a7428bec8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0013.png" +dest_files=[ "res://.import/0013.png-d3699fa27fdabac3d0a7804a7428bec8.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0014.png b/src/Objects/Traps/Bear/Animation/0014.png new file mode 100644 index 0000000..ff6068e Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0014.png differ diff --git a/src/Objects/Traps/Bear/Animation/0014.png.import b/src/Objects/Traps/Bear/Animation/0014.png.import new file mode 100644 index 0000000..d086000 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0014.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0014.png-541a7c3e5773ae752b4068c3b99ae1e0.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0014.png" +dest_files=[ "res://.import/0014.png-541a7c3e5773ae752b4068c3b99ae1e0.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0015.png b/src/Objects/Traps/Bear/Animation/0015.png new file mode 100644 index 0000000..7e9b9d6 Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0015.png differ diff --git a/src/Objects/Traps/Bear/Animation/0015.png.import b/src/Objects/Traps/Bear/Animation/0015.png.import new file mode 100644 index 0000000..0e9f628 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0015.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0015.png-c08651a5c171112f6caac805eebd363e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0015.png" +dest_files=[ "res://.import/0015.png-c08651a5c171112f6caac805eebd363e.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0016.png b/src/Objects/Traps/Bear/Animation/0016.png new file mode 100644 index 0000000..9c02e38 Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0016.png differ diff --git a/src/Objects/Traps/Bear/Animation/0016.png.import b/src/Objects/Traps/Bear/Animation/0016.png.import new file mode 100644 index 0000000..8bc9b68 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0016.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0016.png-df1885e11c6b65ccce6f6a9cdb88a770.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0016.png" +dest_files=[ "res://.import/0016.png-df1885e11c6b65ccce6f6a9cdb88a770.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0017.png b/src/Objects/Traps/Bear/Animation/0017.png new file mode 100644 index 0000000..84b3507 Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0017.png differ diff --git a/src/Objects/Traps/Bear/Animation/0017.png.import b/src/Objects/Traps/Bear/Animation/0017.png.import new file mode 100644 index 0000000..ae15ddc --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0017.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0017.png-b7103633dd74f0f98ec9079bda1499e5.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0017.png" +dest_files=[ "res://.import/0017.png-b7103633dd74f0f98ec9079bda1499e5.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0018.png b/src/Objects/Traps/Bear/Animation/0018.png new file mode 100644 index 0000000..7933a32 Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0018.png differ diff --git a/src/Objects/Traps/Bear/Animation/0018.png.import b/src/Objects/Traps/Bear/Animation/0018.png.import new file mode 100644 index 0000000..109c307 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0018.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0018.png-497a1dc89cce76fc2ab1c5e38fa63a6f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0018.png" +dest_files=[ "res://.import/0018.png-497a1dc89cce76fc2ab1c5e38fa63a6f.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0019.png b/src/Objects/Traps/Bear/Animation/0019.png new file mode 100644 index 0000000..29a33e4 Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0019.png differ diff --git a/src/Objects/Traps/Bear/Animation/0019.png.import b/src/Objects/Traps/Bear/Animation/0019.png.import new file mode 100644 index 0000000..d4e5e9e --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0019.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0019.png-a958411d1d57f3e0fca32b00dc7c434d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0019.png" +dest_files=[ "res://.import/0019.png-a958411d1d57f3e0fca32b00dc7c434d.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0020.png b/src/Objects/Traps/Bear/Animation/0020.png new file mode 100644 index 0000000..633c767 Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0020.png differ diff --git a/src/Objects/Traps/Bear/Animation/0020.png.import b/src/Objects/Traps/Bear/Animation/0020.png.import new file mode 100644 index 0000000..a7acbe3 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0020.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0020.png-44b80d2ae978e682d336c22a8bb0d750.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0020.png" +dest_files=[ "res://.import/0020.png-44b80d2ae978e682d336c22a8bb0d750.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0021.png b/src/Objects/Traps/Bear/Animation/0021.png new file mode 100644 index 0000000..3c0667b Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0021.png differ diff --git a/src/Objects/Traps/Bear/Animation/0021.png.import b/src/Objects/Traps/Bear/Animation/0021.png.import new file mode 100644 index 0000000..4e60966 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0021.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0021.png-e08841c64cb425b62c2582e90be4f286.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0021.png" +dest_files=[ "res://.import/0021.png-e08841c64cb425b62c2582e90be4f286.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0022.png b/src/Objects/Traps/Bear/Animation/0022.png new file mode 100644 index 0000000..feb3231 Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0022.png differ diff --git a/src/Objects/Traps/Bear/Animation/0022.png.import b/src/Objects/Traps/Bear/Animation/0022.png.import new file mode 100644 index 0000000..c1c2ccf --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0022.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0022.png-081346af78894b7c24fd5cc4a1913399.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0022.png" +dest_files=[ "res://.import/0022.png-081346af78894b7c24fd5cc4a1913399.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0023.png b/src/Objects/Traps/Bear/Animation/0023.png new file mode 100644 index 0000000..e0e2a1d Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0023.png differ diff --git a/src/Objects/Traps/Bear/Animation/0023.png.import b/src/Objects/Traps/Bear/Animation/0023.png.import new file mode 100644 index 0000000..916b94c --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0023.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0023.png-714da5afbd13b66250faa778354bd6e9.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0023.png" +dest_files=[ "res://.import/0023.png-714da5afbd13b66250faa778354bd6e9.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0024.png b/src/Objects/Traps/Bear/Animation/0024.png new file mode 100644 index 0000000..94e359f Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0024.png differ diff --git a/src/Objects/Traps/Bear/Animation/0024.png.import b/src/Objects/Traps/Bear/Animation/0024.png.import new file mode 100644 index 0000000..020049a --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0024.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0024.png-359be9f452c15ae04c99661262cb4d9c.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0024.png" +dest_files=[ "res://.import/0024.png-359be9f452c15ae04c99661262cb4d9c.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0025.png b/src/Objects/Traps/Bear/Animation/0025.png new file mode 100644 index 0000000..0678839 Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0025.png differ diff --git a/src/Objects/Traps/Bear/Animation/0025.png.import b/src/Objects/Traps/Bear/Animation/0025.png.import new file mode 100644 index 0000000..ed49d76 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0025.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0025.png-d9f80f4d06ff0542efa80cc1a5d8688e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0025.png" +dest_files=[ "res://.import/0025.png-d9f80f4d06ff0542efa80cc1a5d8688e.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0026.png b/src/Objects/Traps/Bear/Animation/0026.png new file mode 100644 index 0000000..ce73401 Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0026.png differ diff --git a/src/Objects/Traps/Bear/Animation/0026.png.import b/src/Objects/Traps/Bear/Animation/0026.png.import new file mode 100644 index 0000000..f080a28 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0026.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0026.png-da664a7593fa4f7f6ebe270457af1aed.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0026.png" +dest_files=[ "res://.import/0026.png-da664a7593fa4f7f6ebe270457af1aed.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0027.png b/src/Objects/Traps/Bear/Animation/0027.png new file mode 100644 index 0000000..c285e01 Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0027.png differ diff --git a/src/Objects/Traps/Bear/Animation/0027.png.import b/src/Objects/Traps/Bear/Animation/0027.png.import new file mode 100644 index 0000000..260313a --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0027.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0027.png-505e5ca0c70f6b100cda0c0fcf0d2e71.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0027.png" +dest_files=[ "res://.import/0027.png-505e5ca0c70f6b100cda0c0fcf0d2e71.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0028.png b/src/Objects/Traps/Bear/Animation/0028.png new file mode 100644 index 0000000..308fbae Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0028.png differ diff --git a/src/Objects/Traps/Bear/Animation/0028.png.import b/src/Objects/Traps/Bear/Animation/0028.png.import new file mode 100644 index 0000000..e2be418 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0028.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0028.png-8997a4898db8bac63554fcdd8ddb00ee.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0028.png" +dest_files=[ "res://.import/0028.png-8997a4898db8bac63554fcdd8ddb00ee.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0029.png b/src/Objects/Traps/Bear/Animation/0029.png new file mode 100644 index 0000000..6775aed Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0029.png differ diff --git a/src/Objects/Traps/Bear/Animation/0029.png.import b/src/Objects/Traps/Bear/Animation/0029.png.import new file mode 100644 index 0000000..e4c3a6b --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0029.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0029.png-2b6ae212df2e8b5c3a95f4cd46a5535c.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0029.png" +dest_files=[ "res://.import/0029.png-2b6ae212df2e8b5c3a95f4cd46a5535c.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/Animation/0030.png b/src/Objects/Traps/Bear/Animation/0030.png new file mode 100644 index 0000000..a01ae39 Binary files /dev/null and b/src/Objects/Traps/Bear/Animation/0030.png differ diff --git a/src/Objects/Traps/Bear/Animation/0030.png.import b/src/Objects/Traps/Bear/Animation/0030.png.import new file mode 100644 index 0000000..e9b7170 --- /dev/null +++ b/src/Objects/Traps/Bear/Animation/0030.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/0030.png-1a67e5c745c6c9fd545daa4239837b61.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/Animation/0030.png" +dest_files=[ "res://.import/0030.png-1a67e5c745c6c9fd545daa4239837b61.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/Bear/bear.jpg b/src/Objects/Traps/Bear/bear.jpg new file mode 100644 index 0000000..0075dfa Binary files /dev/null and b/src/Objects/Traps/Bear/bear.jpg differ diff --git a/src/Objects/Traps/Bear/bear.jpg.import b/src/Objects/Traps/Bear/bear.jpg.import new file mode 100644 index 0000000..b52f808 --- /dev/null +++ b/src/Objects/Traps/Bear/bear.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/bear.jpg-b29183748b9b212469789f175925d154.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Bear/bear.jpg" +dest_files=[ "res://.import/bear.jpg-b29183748b9b212469789f175925d154.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Traps/bear.gd b/src/Objects/Traps/bear.gd index bb72cf4..252fe0c 100644 --- a/src/Objects/Traps/bear.gd +++ b/src/Objects/Traps/bear.gd @@ -1,4 +1,15 @@ extends Node2D func _on_Hurtbox_area_entered(area): - queue_free() + $AnimatedSprite.play("clap") + + +func _ready(): + $AnimatedSprite.play("place") + + +func _on_AnimatedSprite_animation_finished(): + if $AnimatedSprite.get_animation() == "place": + $AnimatedSprite.play("still") + elif $AnimatedSprite.get_animation() == "clap": + queue_free() diff --git a/src/Objects/Traps/bear.tscn b/src/Objects/Traps/bear.tscn index 006bbd1..1191996 100644 --- a/src/Objects/Traps/bear.tscn +++ b/src/Objects/Traps/bear.tscn @@ -1,15 +1,63 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=39 format=2] [ext_resource path="res://Objects/Traps/Bear.gd" type="Script" id=1] [ext_resource path="res://Overlap/HurtHit_Box/Hitbox.tscn" type="PackedScene" id=2] [ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=3] -[ext_resource path="res://testSprites/falle.png" type="Texture" id=4] [ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=5] +[ext_resource path="res://Objects/Traps/Bear/Animation/0018.png" type="Texture" id=6] +[ext_resource path="res://Objects/Traps/Bear/Animation/0001.png" type="Texture" id=7] +[ext_resource path="res://Objects/Traps/Bear/Animation/0025.png" type="Texture" id=8] +[ext_resource path="res://Objects/Traps/Bear/Animation/0005.png" type="Texture" id=9] +[ext_resource path="res://Objects/Traps/Bear/Animation/0014.png" type="Texture" id=10] +[ext_resource path="res://Objects/Traps/Bear/Animation/0003.png" type="Texture" id=11] +[ext_resource path="res://Objects/Traps/Bear/Animation/0000.png" type="Texture" id=12] +[ext_resource path="res://Objects/Traps/Bear/Animation/0010.png" type="Texture" id=13] +[ext_resource path="res://Objects/Traps/Bear/Animation/0004.png" type="Texture" id=14] +[ext_resource path="res://Objects/Traps/Bear/Animation/0008.png" type="Texture" id=15] +[ext_resource path="res://Objects/Traps/Bear/Animation/0023.png" type="Texture" id=16] +[ext_resource path="res://Objects/Traps/Bear/Animation/0026.png" type="Texture" id=17] +[ext_resource path="res://Objects/Traps/Bear/Animation/0027.png" type="Texture" id=18] +[ext_resource path="res://Objects/Traps/Bear/Animation/0020.png" type="Texture" id=19] +[ext_resource path="res://Objects/Traps/Bear/Animation/0028.png" type="Texture" id=20] +[ext_resource path="res://Objects/Traps/Bear/Animation/0024.png" type="Texture" id=21] +[ext_resource path="res://Objects/Traps/Bear/Animation/0011.png" type="Texture" id=22] +[ext_resource path="res://Objects/Traps/Bear/Animation/0015.png" type="Texture" id=23] +[ext_resource path="res://Objects/Traps/Bear/Animation/0007.png" type="Texture" id=24] +[ext_resource path="res://Objects/Traps/Bear/Animation/0019.png" type="Texture" id=25] +[ext_resource path="res://Objects/Traps/Bear/Animation/0021.png" type="Texture" id=26] +[ext_resource path="res://Objects/Traps/Bear/Animation/0016.png" type="Texture" id=27] +[ext_resource path="res://Objects/Traps/Bear/Animation/0002.png" type="Texture" id=28] +[ext_resource path="res://Objects/Traps/Bear/Animation/0006.png" type="Texture" id=29] +[ext_resource path="res://Objects/Traps/Bear/Animation/0013.png" type="Texture" id=30] +[ext_resource path="res://Objects/Traps/Bear/Animation/0017.png" type="Texture" id=31] +[ext_resource path="res://Objects/Traps/Bear/Animation/0022.png" type="Texture" id=32] +[ext_resource path="res://Objects/Traps/Bear/Animation/0029.png" type="Texture" id=33] +[ext_resource path="res://Objects/Traps/Bear/Animation/0030.png" type="Texture" id=34] +[ext_resource path="res://Objects/Traps/Bear/Animation/0009.png" type="Texture" id=35] +[ext_resource path="res://Objects/Traps/Bear/Animation/0012.png" type="Texture" id=36] -[sub_resource type="CapsuleShape2D" id=1] +[sub_resource type="SpriteFrames" id=4] +animations = [ { +"frames": [ ExtResource( 12 ), ExtResource( 7 ), ExtResource( 28 ), ExtResource( 11 ), ExtResource( 14 ), ExtResource( 9 ), ExtResource( 29 ), ExtResource( 24 ), ExtResource( 15 ), ExtResource( 35 ), ExtResource( 13 ), ExtResource( 22 ) ], +"loop": false, +"name": "place", +"speed": 60.0 +}, { +"frames": [ ExtResource( 30 ), ExtResource( 10 ), ExtResource( 23 ), ExtResource( 27 ), ExtResource( 31 ), ExtResource( 6 ), ExtResource( 25 ), ExtResource( 19 ), ExtResource( 26 ), ExtResource( 32 ), ExtResource( 16 ), ExtResource( 21 ), ExtResource( 8 ), ExtResource( 17 ), ExtResource( 18 ), ExtResource( 20 ), ExtResource( 33 ), ExtResource( 34 ) ], +"loop": false, +"name": "clap", +"speed": 60.0 +}, { +"frames": [ ExtResource( 36 ) ], +"loop": false, +"name": "still", +"speed": 60.0 +} ] + +[sub_resource type="CapsuleShape2D" id=5] height = 9.0 -[sub_resource type="CapsuleShape2D" id=2] +[sub_resource type="CapsuleShape2D" id=3] height = 9.0 [node name="Bear_trap" type="Node2D"] @@ -18,16 +66,16 @@ script = ExtResource( 1 ) [node name="Kind" parent="." instance=ExtResource( 3 )] kind = 10 -[node name="Sprite" type="Sprite" parent="."] +[node name="AnimatedSprite" type="AnimatedSprite" parent="."] position = Vector2( -7.62939e-06, 0 ) -texture = ExtResource( 4 ) +frames = SubResource( 4 ) [node name="Hitbox" parent="." instance=ExtResource( 2 )] collision_layer = 16 [node name="CollisionShape2D" parent="Hitbox" index="0"] rotation = 1.5708 -shape = SubResource( 1 ) +shape = SubResource( 5 ) [node name="Hurtbox" parent="." instance=ExtResource( 5 )] collision_layer = 32 @@ -35,7 +83,8 @@ collision_mask = 0 [node name="CollisionShape2D" parent="Hurtbox" index="0"] rotation = 1.5708 -shape = SubResource( 2 ) +shape = SubResource( 3 ) +[connection signal="animation_finished" from="AnimatedSprite" to="." method="_on_AnimatedSprite_animation_finished"] [connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"] [editable path="Hitbox"] diff --git a/src/Overlap/Mechanics/Mechanics.gd b/src/Overlap/Mechanics/Mechanics.gd new file mode 100644 index 0000000..61510e1 --- /dev/null +++ b/src/Overlap/Mechanics/Mechanics.gd @@ -0,0 +1 @@ +extends Node diff --git a/src/Overlap/Mechanics/Mechanics.tscn b/src/Overlap/Mechanics/Mechanics.tscn new file mode 100644 index 0000000..76eead0 --- /dev/null +++ b/src/Overlap/Mechanics/Mechanics.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://Overlap/Mechanics/Mechanics.gd" type="Script" id=1] + +[node name="Core" type="Node"] +script = ExtResource( 1 ) diff --git a/src/World.tscn b/src/World.tscn index b63f362..ab36bb7 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -24,26 +24,26 @@ position = Vector2( 16, 16 ) tile_set = ExtResource( 3 ) cell_size = Vector2( 32, 32 ) format = 1 -tile_data = PoolIntArray( -131059, 47, 0, -131058, 47, 2, -1, 47, 4, -65536, 47, 196609, -65535, 47, 196609, -65534, 47, 196609, -65533, 47, 196609, -65532, 47, 196609, -65531, 47, 196609, -65530, 47, 8, -65529, 47, 196609, -65528, 47, 8, -65527, 47, 196609, -65526, 47, 196609, -65525, 47, 196609, -65524, 47, 196609, -65523, 47, 196614, -65522, 47, 196618, -65521, 47, 196610, 65535, 47, 65539, 6, 47, 131075, 8, 47, 131075, 14, 47, 65539, 131071, 47, 65539, 65541, 47, 196611, 65550, 47, 65539, 196607, 47, 65539, 131075, 47, 196608, 131076, 47, 196610, 131086, 47, 65539, 262143, 47, 65539, 196614, 47, 196611, 196622, 47, 65539, 327679, 47, 65539, 262147, 47, 196611, 262149, 47, 196611, 262158, 47, 65539, 393215, 47, 65539, 327684, 47, 196611, 327688, 47, 196611, 327694, 47, 65539, 458751, 47, 65539, 393221, 47, 3, 393225, 47, 3, 393230, 47, 65539, 524287, 47, 196612, 458752, 47, 196609, 458753, 47, 196609, 458754, 47, 196609, 458755, 47, 196609, 458756, 47, 196609, 458757, 47, 196616, 458758, 47, 196609, 458759, 47, 196609, 458760, 47, 196609, 458761, 47, 196616, 458762, 47, 196609, 458763, 47, 196609, 458764, 47, 196609, 458765, 47, 196609, 458766, 47, 196615 ) +tile_data = PoolIntArray( -1, 47, 4, -65536, 47, 196609, -65535, 47, 196609, -65534, 47, 196609, -65533, 47, 196609, -65532, 47, 196609, -65531, 47, 196609, -65530, 47, 8, -65529, 47, 196609, -65528, 47, 8, -65527, 47, 196609, -65526, 47, 196609, -65525, 47, 196609, -65524, 47, 196609, -65523, 47, 196609, -65522, 47, 7, 65535, 47, 65539, 6, 47, 131075, 8, 47, 131075, 14, 47, 65539, 131071, 47, 65539, 65541, 47, 196611, 65550, 47, 65539, 196607, 47, 65539, 131075, 47, 196608, 131076, 47, 196610, 131086, 47, 65539, 262143, 47, 65539, 196614, 47, 196611, 196622, 47, 65539, 327679, 47, 65539, 262147, 47, 196611, 262149, 47, 196611, 262158, 47, 65539, 393215, 47, 65539, 327684, 47, 196611, 327688, 47, 196611, 327694, 47, 65539, 458751, 47, 65539, 393221, 47, 3, 393225, 47, 3, 393230, 47, 65539, 524287, 47, 196612, 458752, 47, 196609, 458753, 47, 196609, 458754, 47, 196609, 458755, 47, 196609, 458756, 47, 196609, 458757, 47, 196616, 458758, 47, 196609, 458759, 47, 196609, 458760, 47, 196609, 458761, 47, 196616, 458762, 47, 196609, 458763, 47, 196609, 458764, 47, 196609, 458765, 47, 196609, 458766, 47, 196615 ) __meta__ = { "_edit_group_": true, "_edit_lock_": true } [node name="YSort" type="YSort" parent="."] -position = Vector2( 152, 120 ) [node name="Bonfire" parent="YSort" instance=ExtResource( 10 )] -position = Vector2( 264, -24 ) +position = Vector2( 406.635, 139.865 ) [node name="Player" parent="YSort" instance=ExtResource( 1 )] -position = Vector2( 240, 72 ) +position = Vector2( 342.83, 130.381 ) scale = Vector2( 2, 2 ) +debug = true ROLL_SPEED = 140 FRICTION = 200 [node name="Boss_template" parent="YSort" instance=ExtResource( 17 )] -position = Vector2( -67.0889, 2.27742 ) +position = Vector2( 71.566, 94.4929 ) debug = true [node name="Grid" parent="." instance=ExtResource( 18 )] @@ -54,6 +54,8 @@ debug = true visible = false [node name="DragNDropUI" parent="CanvasLayer" instance=ExtResource( 5 )] -ObjectParent = NodePath("../..") +margin_top = -0.735092 +margin_bottom = -0.735107 +ObjectParent = NodePath("../../YSort") [editable path="YSort/Bonfire"]