diff --git a/Assets/Sprites/Misc/flame-large.ase b/Assets/Sprites/Misc/flame-large.ase new file mode 100644 index 0000000..2a0c2b5 Binary files /dev/null and b/Assets/Sprites/Misc/flame-large.ase differ diff --git a/Assets/Sprites/Misc/flame-large.png b/Assets/Sprites/Misc/flame-large.png new file mode 100644 index 0000000..fd1a759 Binary files /dev/null and b/Assets/Sprites/Misc/flame-large.png differ diff --git a/Assets/Sprites/Misc/flame-large.png.import b/Assets/Sprites/Misc/flame-large.png.import new file mode 100644 index 0000000..9ec42f2 --- /dev/null +++ b/Assets/Sprites/Misc/flame-large.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c1garalf1clsp" +path="res://.godot/imported/flame-large.png-41b172a8bfc9c186ab97a98ae0c5a459.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Sprites/Misc/flame-large.png" +dest_files=["res://.godot/imported/flame-large.png-41b172a8bfc9c186ab97a98ae0c5a459.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Sprites/Misc/torch-base.ase b/Assets/Sprites/Misc/torch-base.ase new file mode 100644 index 0000000..d213a9d Binary files /dev/null and b/Assets/Sprites/Misc/torch-base.ase differ diff --git a/Assets/Sprites/Misc/torch-base.png b/Assets/Sprites/Misc/torch-base.png new file mode 100644 index 0000000..5a6007d Binary files /dev/null and b/Assets/Sprites/Misc/torch-base.png differ diff --git a/Assets/Sprites/Misc/torch-base.png.import b/Assets/Sprites/Misc/torch-base.png.import new file mode 100644 index 0000000..8212538 --- /dev/null +++ b/Assets/Sprites/Misc/torch-base.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bitpf645g0prl" +path="res://.godot/imported/torch-base.png-d14e78df3788bf6d3a9565b574d6c1a1.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Sprites/Misc/torch-base.png" +dest_files=["res://.godot/imported/torch-base.png-d14e78df3788bf6d3a9565b574d6c1a1.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Sprites/Misc/torch-fire.ase b/Assets/Sprites/Misc/torch-fire.ase new file mode 100644 index 0000000..ad323ff Binary files /dev/null and b/Assets/Sprites/Misc/torch-fire.ase differ diff --git a/Assets/Sprites/Misc/torch-fire.png b/Assets/Sprites/Misc/torch-fire.png new file mode 100644 index 0000000..aa6b72f Binary files /dev/null and b/Assets/Sprites/Misc/torch-fire.png differ diff --git a/Assets/Sprites/Misc/torch-fire.png.import b/Assets/Sprites/Misc/torch-fire.png.import new file mode 100644 index 0000000..65b6de4 --- /dev/null +++ b/Assets/Sprites/Misc/torch-fire.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cyfyelyq3o15s" +path="res://.godot/imported/torch-fire.png-a9f51cf7273c726b68014cb26a31d54c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Sprites/Misc/torch-fire.png" +dest_files=["res://.godot/imported/torch-fire.png-a9f51cf7273c726b68014cb26a31d54c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Sprites/Misc/torch-lamp-base-back.ase b/Assets/Sprites/Misc/torch-lamp-base-back.ase new file mode 100644 index 0000000..0d5f0ae Binary files /dev/null and b/Assets/Sprites/Misc/torch-lamp-base-back.ase differ diff --git a/Assets/Sprites/Misc/torch-lamp-base-back.png b/Assets/Sprites/Misc/torch-lamp-base-back.png new file mode 100644 index 0000000..dad040d Binary files /dev/null and b/Assets/Sprites/Misc/torch-lamp-base-back.png differ diff --git a/Assets/Sprites/Misc/torch-lamp-base-back.png.import b/Assets/Sprites/Misc/torch-lamp-base-back.png.import new file mode 100644 index 0000000..8106ac6 --- /dev/null +++ b/Assets/Sprites/Misc/torch-lamp-base-back.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://i5ksh8i0q48o" +path="res://.godot/imported/torch-lamp-base-back.png-a6c17eff02f04f493c4e495a2d662d5a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Sprites/Misc/torch-lamp-base-back.png" +dest_files=["res://.godot/imported/torch-lamp-base-back.png-a6c17eff02f04f493c4e495a2d662d5a.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Assets/Sprites/Misc/torch-lamp-base.ase b/Assets/Sprites/Misc/torch-lamp-base.ase new file mode 100644 index 0000000..53c9953 Binary files /dev/null and b/Assets/Sprites/Misc/torch-lamp-base.ase differ diff --git a/Assets/Sprites/Misc/torch-lamp-base.png b/Assets/Sprites/Misc/torch-lamp-base.png new file mode 100644 index 0000000..270b1aa Binary files /dev/null and b/Assets/Sprites/Misc/torch-lamp-base.png differ diff --git a/Assets/Sprites/Misc/torch-lamp-base.png.import b/Assets/Sprites/Misc/torch-lamp-base.png.import new file mode 100644 index 0000000..a81c890 --- /dev/null +++ b/Assets/Sprites/Misc/torch-lamp-base.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ca0htndnsb38k" +path="res://.godot/imported/torch-lamp-base.png-03b38ecb41ff35cadec5aeaad2c98e38.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Sprites/Misc/torch-lamp-base.png" +dest_files=["res://.godot/imported/torch-lamp-base.png-03b38ecb41ff35cadec5aeaad2c98e38.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Entities/Lightning.tscn b/Entities/Lightning.tscn index 2970374..031e582 100644 --- a/Entities/Lightning.tscn +++ b/Entities/Lightning.tscn @@ -85,7 +85,7 @@ tracks/2/keys = { "times": PackedFloat32Array(0, 0.7), "transitions": PackedFloat32Array(1, 1), "update": 0, -"values": [0.5, 0.0] +"values": [1.0, 0.0] } [sub_resource type="AnimationLibrary" id="AnimationLibrary_g3m4l"] @@ -105,6 +105,7 @@ ProjectileName = "Lightning" Hitbox = NodePath("Hitbox") [node name="Sprite2D" type="Sprite2D" parent="."] +modulate = Color(4, 4, 4, 1) material = SubResource("CanvasItemMaterial_3bsa7") position = Vector2(0, 8) texture = ExtResource("1_bf8ae") @@ -119,6 +120,7 @@ libraries = { [node name="Hitbox" parent="." instance=ExtResource("3_vlt1v")] collision_layer = 0 +priority = 5 Damage = 20.0 [node name="CollisionShape2D" parent="Hitbox" index="0"] diff --git a/Entities/Torch.tscn b/Entities/Torch.tscn index d0d49c1..283322d 100644 --- a/Entities/Torch.tscn +++ b/Entities/Torch.tscn @@ -1,59 +1,60 @@ -[gd_scene load_steps=12 format=3 uid="uid://c1w7t6irnohfx"] +[gd_scene load_steps=13 format=3 uid="uid://c1w7t6irnohfx"] -[ext_resource type="Texture2D" uid="uid://har1bd5u4dq3" path="res://Assets/Sprites/Misc/torch.png" id="1_14bgb"] +[ext_resource type="Texture2D" uid="uid://cyfyelyq3o15s" path="res://Assets/Sprites/Misc/torch-fire.png" id="1_gnoxc"] +[ext_resource type="Texture2D" uid="uid://bitpf645g0prl" path="res://Assets/Sprites/Misc/torch-base.png" id="2_cwgtj"] [ext_resource type="Texture2D" uid="uid://coarr28adgo1u" path="res://Assets/Sprites/Particles/point-light.png" id="2_hotvd"] -[sub_resource type="AtlasTexture" id="AtlasTexture_js1l1"] -atlas = ExtResource("1_14bgb") -region = Rect2(0, 0, 8, 12) +[sub_resource type="AtlasTexture" id="AtlasTexture_vnjya"] +atlas = ExtResource("1_gnoxc") +region = Rect2(0, 0, 8, 8) -[sub_resource type="AtlasTexture" id="AtlasTexture_gdxtl"] -atlas = ExtResource("1_14bgb") -region = Rect2(8, 0, 8, 12) +[sub_resource type="AtlasTexture" id="AtlasTexture_l2emm"] +atlas = ExtResource("1_gnoxc") +region = Rect2(8, 0, 8, 8) -[sub_resource type="AtlasTexture" id="AtlasTexture_da7fw"] -atlas = ExtResource("1_14bgb") -region = Rect2(16, 0, 8, 12) +[sub_resource type="AtlasTexture" id="AtlasTexture_03weu"] +atlas = ExtResource("1_gnoxc") +region = Rect2(16, 0, 8, 8) -[sub_resource type="AtlasTexture" id="AtlasTexture_rpccx"] -atlas = ExtResource("1_14bgb") -region = Rect2(24, 0, 8, 12) +[sub_resource type="AtlasTexture" id="AtlasTexture_1fqw1"] +atlas = ExtResource("1_gnoxc") +region = Rect2(24, 0, 8, 8) -[sub_resource type="AtlasTexture" id="AtlasTexture_crwu1"] -atlas = ExtResource("1_14bgb") -region = Rect2(32, 0, 8, 12) +[sub_resource type="AtlasTexture" id="AtlasTexture_sj1bi"] +atlas = ExtResource("1_gnoxc") +region = Rect2(32, 0, 8, 8) -[sub_resource type="AtlasTexture" id="AtlasTexture_r3kxc"] -atlas = ExtResource("1_14bgb") -region = Rect2(40, 0, 8, 12) +[sub_resource type="AtlasTexture" id="AtlasTexture_1xpxx"] +atlas = ExtResource("1_gnoxc") +region = Rect2(40, 0, 8, 8) -[sub_resource type="AtlasTexture" id="AtlasTexture_225la"] -atlas = ExtResource("1_14bgb") -region = Rect2(48, 0, 8, 12) +[sub_resource type="AtlasTexture" id="AtlasTexture_dxfgw"] +atlas = ExtResource("1_gnoxc") +region = Rect2(48, 0, 8, 8) [sub_resource type="SpriteFrames" id="SpriteFrames_gf7ku"] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_js1l1") +"texture": SubResource("AtlasTexture_vnjya") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_gdxtl") +"texture": SubResource("AtlasTexture_l2emm") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_da7fw") +"texture": SubResource("AtlasTexture_03weu") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_rpccx") +"texture": SubResource("AtlasTexture_1fqw1") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_crwu1") +"texture": SubResource("AtlasTexture_sj1bi") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_r3kxc") +"texture": SubResource("AtlasTexture_1xpxx") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_225la") +"texture": SubResource("AtlasTexture_dxfgw") }], "loop": true, "name": &"default", @@ -64,19 +65,28 @@ animations = [{ radius = 4.0 [node name="Torch" type="Node2D"] +y_sort_enabled = true -[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] -texture_filter = 1 -position = Vector2(0, -10) +[node name="Sprites" type="Node2D" parent="."] + +[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="Sprites"] +modulate = Color(3.5, 3.5, 3, 1) +position = Vector2(0, -14) sprite_frames = SubResource("SpriteFrames_gf7ku") autoplay = "default" frame_progress = 0.337799 +[node name="Sprite2D" type="Sprite2D" parent="Sprites"] +position = Vector2(0, -8) +texture = ExtResource("2_cwgtj") + [node name="PointLight2D" type="PointLight2D" parent="."] color = Color(1, 0.811765, 0.537255, 1) +energy = 1.2 blend_mode = 2 shadow_enabled = true shadow_filter_smooth = 3.0 +shadow_item_cull_mask = 8 texture = ExtResource("2_hotvd") offset = Vector2(0, 2) texture_scale = 0.25 diff --git a/Entities/TorchLamp.tscn b/Entities/TorchLamp.tscn index d858e18..1ce4a7d 100644 --- a/Entities/TorchLamp.tscn +++ b/Entities/TorchLamp.tscn @@ -1,94 +1,96 @@ -[gd_scene load_steps=16 format=3 uid="uid://ceadk7pam7vab"] +[gd_scene load_steps=18 format=3 uid="uid://ceadk7pam7vab"] -[ext_resource type="Texture2D" uid="uid://cyldr0ck3yfrp" path="res://Assets/Sprites/Misc/torch-lamp.png" id="1_dlkl0"] [ext_resource type="Texture2D" uid="uid://coarr28adgo1u" path="res://Assets/Sprites/Particles/point-light.png" id="2_0xpf8"] +[ext_resource type="Texture2D" uid="uid://c1garalf1clsp" path="res://Assets/Sprites/Misc/flame-large.png" id="2_a6lwn"] +[ext_resource type="Texture2D" uid="uid://ca0htndnsb38k" path="res://Assets/Sprites/Misc/torch-lamp-base.png" id="2_bq1kw"] +[ext_resource type="Texture2D" uid="uid://i5ksh8i0q48o" path="res://Assets/Sprites/Misc/torch-lamp-base-back.png" id="3_vh465"] -[sub_resource type="AtlasTexture" id="AtlasTexture_ikvnd"] -atlas = ExtResource("1_dlkl0") -region = Rect2(0, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_dtmd3"] +atlas = ExtResource("2_a6lwn") +region = Rect2(0, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_b7wal"] -atlas = ExtResource("1_dlkl0") -region = Rect2(12, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_irtpk"] +atlas = ExtResource("2_a6lwn") +region = Rect2(12, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_68y2k"] -atlas = ExtResource("1_dlkl0") -region = Rect2(24, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_0gb20"] +atlas = ExtResource("2_a6lwn") +region = Rect2(24, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_eib4d"] -atlas = ExtResource("1_dlkl0") -region = Rect2(36, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_5uhdg"] +atlas = ExtResource("2_a6lwn") +region = Rect2(36, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_7q5cd"] -atlas = ExtResource("1_dlkl0") -region = Rect2(48, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_e4moo"] +atlas = ExtResource("2_a6lwn") +region = Rect2(48, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_k8jtr"] -atlas = ExtResource("1_dlkl0") -region = Rect2(60, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_soja6"] +atlas = ExtResource("2_a6lwn") +region = Rect2(60, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_egan1"] -atlas = ExtResource("1_dlkl0") -region = Rect2(72, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_sn741"] +atlas = ExtResource("2_a6lwn") +region = Rect2(72, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_eymjc"] -atlas = ExtResource("1_dlkl0") -region = Rect2(84, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_r825r"] +atlas = ExtResource("2_a6lwn") +region = Rect2(84, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_go3ky"] -atlas = ExtResource("1_dlkl0") -region = Rect2(96, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_75y5m"] +atlas = ExtResource("2_a6lwn") +region = Rect2(96, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_rvq52"] -atlas = ExtResource("1_dlkl0") -region = Rect2(108, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_l8r4c"] +atlas = ExtResource("2_a6lwn") +region = Rect2(108, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_cjdtb"] -atlas = ExtResource("1_dlkl0") -region = Rect2(120, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_7gxo8"] +atlas = ExtResource("2_a6lwn") +region = Rect2(120, 0, 12, 14) -[sub_resource type="AtlasTexture" id="AtlasTexture_vi5xh"] -atlas = ExtResource("1_dlkl0") -region = Rect2(132, 0, 12, 24) +[sub_resource type="AtlasTexture" id="AtlasTexture_60wov"] +atlas = ExtResource("2_a6lwn") +region = Rect2(132, 0, 12, 14) [sub_resource type="SpriteFrames" id="SpriteFrames_gf7ku"] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_ikvnd") +"texture": SubResource("AtlasTexture_dtmd3") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_b7wal") +"texture": SubResource("AtlasTexture_irtpk") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_68y2k") +"texture": SubResource("AtlasTexture_0gb20") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_eib4d") +"texture": SubResource("AtlasTexture_5uhdg") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_7q5cd") +"texture": SubResource("AtlasTexture_e4moo") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_k8jtr") +"texture": SubResource("AtlasTexture_soja6") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_egan1") +"texture": SubResource("AtlasTexture_sn741") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_eymjc") +"texture": SubResource("AtlasTexture_r825r") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_go3ky") +"texture": SubResource("AtlasTexture_75y5m") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_rvq52") +"texture": SubResource("AtlasTexture_l8r4c") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_cjdtb") +"texture": SubResource("AtlasTexture_7gxo8") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_vi5xh") +"texture": SubResource("AtlasTexture_60wov") }], "loop": true, "name": &"default", @@ -97,15 +99,26 @@ animations = [{ [node name="TorchLamp" type="Node2D"] +[node name="Sprite2D2" type="Sprite2D" parent="."] +texture = ExtResource("3_vh465") +centered = false +offset = Vector2(-6, -16) + [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +modulate = Color(2.5, 2, 2, 1) y_sort_enabled = true texture_filter = 1 +position = Vector2(0, -6) sprite_frames = SubResource("SpriteFrames_gf7ku") autoplay = "default" -frame = 9 -frame_progress = 0.966501 +frame_progress = 0.557817 offset = Vector2(0, -12) +[node name="Sprite2D" type="Sprite2D" parent="."] +texture = ExtResource("2_bq1kw") +centered = false +offset = Vector2(-6, -16) + [node name="PointLight2D" type="PointLight2D" parent="."] color = Color(1, 0.811765, 0.537255, 1) energy = 1.2 @@ -113,3 +126,13 @@ blend_mode = 2 shadow_filter_smooth = 3.0 texture = ExtResource("2_0xpf8") texture_scale = 0.25 + +[node name="PointLight2D2" type="PointLight2D" parent="."] +visible = false +color = Color(1, 0.811765, 0.537255, 1) +energy = 1.2 +blend_mode = 2 +range_item_cull_mask = 8 +shadow_filter_smooth = 3.0 +texture = ExtResource("2_0xpf8") +texture_scale = 0.25 diff --git a/Entities/UnwantedFrequency.tscn b/Entities/UnwantedFrequency.tscn index d831162..bd1dd69 100644 --- a/Entities/UnwantedFrequency.tscn +++ b/Entities/UnwantedFrequency.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=24 format=3 uid="uid://1y5r6sklwgrp"] +[gd_scene load_steps=25 format=3 uid="uid://1y5r6sklwgrp"] [ext_resource type="Script" path="res://Entities/UnwantedFrequency.cs" id="1_6sbe0"] [ext_resource type="PackedScene" uid="uid://du5vhccg75nrq" path="res://BoundingBoxes/Hitbox.tscn" id="2_gxtvd"] @@ -10,17 +10,20 @@ [sub_resource type="RectangleShape2D" id="RectangleShape2D_30y8q"] size = Vector2(8, 8) +[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_dhurx"] +light_mode = 1 + [sub_resource type="Curve" id="Curve_eu273"] _data = [Vector2(0.0618557, 0), 0.0, 0.0, 0, 0, Vector2(0.489691, 1), 0.0, 0.0, 0, 0] point_count = 2 [sub_resource type="Gradient" id="Gradient_dyqhb"] offsets = PackedFloat32Array(0.00662252, 0.715232, 1) -colors = PackedColorArray(0.996078, 0, 0.164706, 0, 0.996045, 0, 0.166638, 1, 1, 1, 1, 1) +colors = PackedColorArray(0.996078, 0, 0.164706, 0, 1.992, 0, 0.334, 1, 2, 2, 2, 1) [sub_resource type="Gradient" id="Gradient_m1y6u"] offsets = PackedFloat32Array(0.00662252, 0.715232, 1) -colors = PackedColorArray(0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1) +colors = PackedColorArray(0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 1) [sub_resource type="Gradient" id="Gradient_2q0ut"] offsets = PackedFloat32Array(0.525926, 0.740741, 1) @@ -132,11 +135,14 @@ Knockback = 324.0 shape = SubResource("RectangleShape2D_30y8q") [node name="TrailRotation" type="Node2D" parent="."] +material = SubResource("CanvasItemMaterial_dhurx") [node name="TrailPosition" type="Node2D" parent="TrailRotation"] +use_parent_material = true [node name="Trail" parent="TrailRotation/TrailPosition" instance=ExtResource("3_67uhs")] self_modulate = Color(2, 2, 2, 1) +use_parent_material = true width = 2.0 width_curve = SubResource("Curve_eu273") default_color = Color(1, 0.0862745, 0.207843, 1) @@ -148,9 +154,11 @@ MaximumPoints = 64 Frequency = 30 [node name="TrailPosition2" type="Node2D" parent="TrailRotation"] +use_parent_material = true [node name="Trail" parent="TrailRotation/TrailPosition2" instance=ExtResource("3_67uhs")] self_modulate = Color(2, 2, 2, 1) +use_parent_material = true width = 2.0 width_curve = SubResource("Curve_eu273") gradient = SubResource("Gradient_m1y6u") diff --git a/Items/Weapons/Bow.cs b/Items/Weapons/Bow.cs index 5850878..78c906f 100644 --- a/Items/Weapons/Bow.cs +++ b/Items/Weapons/Bow.cs @@ -1,4 +1,5 @@ using Godot; +using SupaLidlGame.Extensions; namespace SupaLidlGame.Items.Weapons; @@ -30,7 +31,11 @@ public partial class Bow : ProjectileSpawner _ignitionArea = GetNode("IgnitionArea"); var onAreaEntered = (Area2D area) => { - GetNode("%Flame").Visible = true; + var flame = GetNode("%Flame"); + flame.Visible = true; + flame.GetNode("Ignite") + .OnWorld() + .PlayOneShot(); _isOnFire = true; }; _ignitionArea.Connect( diff --git a/Items/Weapons/Bow.tscn b/Items/Weapons/Bow.tscn index 707aadf..401809d 100644 --- a/Items/Weapons/Bow.tscn +++ b/Items/Weapons/Bow.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=28 format=3 uid="uid://cgg0sfm2qeiwn"] +[gd_scene load_steps=29 format=3 uid="uid://cgg0sfm2qeiwn"] [ext_resource type="Texture2D" uid="uid://dam6aigkw8xs" path="res://Assets/Sprites/Items/bow-and-arrow.png" id="1_1ghvv"] [ext_resource type="Script" path="res://Items/Weapons/Bow.cs" id="1_ikgu2"] @@ -12,6 +12,7 @@ [ext_resource type="Texture2D" uid="uid://coarr28adgo1u" path="res://Assets/Sprites/Particles/point-light.png" id="9_tk6lc"] [ext_resource type="AudioStream" uid="uid://cwy4giq8eod5g" path="res://Assets/Sounds/bow-release.wav" id="9_v051g"] [ext_resource type="Texture2D" uid="uid://dj1vsctgh1scr" path="res://Assets/Sprites/Misc/flame.png" id="9_xwcvy"] +[ext_resource type="AudioStream" uid="uid://braj74by0oowo" path="res://Assets/Sounds/fire-burst-flash.wav" id="11_65ega"] [sub_resource type="AtlasTexture" id="AtlasTexture_5af70"] atlas = ExtResource("9_xwcvy") @@ -370,15 +371,20 @@ hframes = 8 [node name="Flame" type="AnimatedSprite2D" parent="Anchor"] unique_name_in_owner = true visible = false +modulate = Color(3, 3, 3, 1) position = Vector2(15, -8) sprite_frames = SubResource("SpriteFrames_b2khh") autoplay = "default" [node name="PointLight2D" type="PointLight2D" parent="Anchor/Flame"] color = Color(1, 0.8, 0.701961, 1) +energy = 0.5 texture = ExtResource("9_tk6lc") texture_scale = 0.13 +[node name="Ignite" type="AudioStreamPlayer2D" parent="Anchor/Flame"] +stream = ExtResource("11_65ega") + [node name="AnimationPlayer" type="AnimationPlayer" parent="."] libraries = { "": SubResource("AnimationLibrary_5vx8d") diff --git a/Scenes/BaseMap.tscn b/Scenes/BaseMap.tscn index 9a3bc17..278f92a 100644 --- a/Scenes/BaseMap.tscn +++ b/Scenes/BaseMap.tscn @@ -10,7 +10,7 @@ physics_layer_1/collision_mask = 0 [sub_resource type="Environment" id="Environment_pxx66"] background_mode = 3 glow_enabled = true -glow_hdr_threshold = 1.4 +glow_hdr_threshold = 1.2 [node name="TileMap" type="Node2D" node_paths=PackedStringArray("Entities", "Areas", "Spawners", "Markers")] process_mode = 1