diff --git a/components/Bullets/InfinitySword.tscn b/components/Bullets/InfinitySword.tscn index 9f14433..2cd0410 100644 --- a/components/Bullets/InfinitySword.tscn +++ b/components/Bullets/InfinitySword.tscn @@ -3,6 +3,7 @@ [ext_resource type="PackedScene" uid="uid://crtdkysmnkith" path="res://components/Abstracts/BulletBase.tscn" id="1_na6tw"] [ext_resource type="Script" uid="uid://b7vswg8ju8a0u" path="res://scripts/Contents/Bullets/InfinitySword.gd" id="2_nbqhn"] [ext_resource type="Texture2D" uid="uid://bp687pj8b7wv0" path="res://resources/bullets/infinity-sword/Effect_DangerJumpSlash6.png" id="3_nbqhn"] +[ext_resource type="AudioStream" uid="uid://b0emg4tbjpl1l" path="res://resources/sounds/effect/fireshot.mp3" id="4_gbi5w"] [sub_resource type="SpriteFrames" id="SpriteFrames_c741v"] animations = [{ @@ -87,7 +88,7 @@ tracks/0/loop_wrap = true tracks/0/keys = { "handle_modes": PackedInt32Array(0, 0, 0, 2), "points": PackedFloat32Array(0, -0.25, 0, 0, 0, 0.5, -0.25, 0, 0, 0, 0.5, 0, 0, 0, 0, 0, -0.25, 0, 0, 0), -"times": PackedFloat32Array(0, 0.15, 1.85, 2) +"times": PackedFloat32Array(0, 0.2, 1.8, 2) } tracks/1/type = "bezier" tracks/1/imported = false @@ -98,7 +99,7 @@ tracks/1/loop_wrap = true tracks/1/keys = { "handle_modes": PackedInt32Array(2, 0, 0, 0), "points": PackedFloat32Array(0, 0, 0, 0, 0, 0.5, -0.25, 0, 0, 0, 0.5, 0, 0, 0, 0, 0, -0.25, 0, 0, 0), -"times": PackedFloat32Array(0, 0.15, 1.85, 2) +"times": PackedFloat32Array(0, 0.2, 1.8, 2) } tracks/2/type = "value" tracks/2/imported = false @@ -107,11 +108,26 @@ tracks/2/path = NodePath(".:modulate") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { -"times": PackedFloat32Array(0, 0.15, 1.85, 2), +"times": PackedFloat32Array(0, 0.2, 1.8, 2), "transitions": PackedFloat32Array(1, 1, 1, 1), "update": 0, "values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1), Color(1, 1, 1, 1), Color(1, 1, 1, 0)] } +tracks/3/type = "audio" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("audio") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"clips": [{ +"end_offset": 0.0, +"start_offset": 0.0, +"stream": ExtResource("4_gbi5w") +}], +"times": PackedFloat32Array(0) +} +tracks/3/use_blend = true [sub_resource type="AnimationLibrary" id="AnimationLibrary_3cvbl"] _data = { @@ -141,5 +157,8 @@ sprite_frames = SubResource("SpriteFrames_c741v") [node name="animator" parent="texture" index="0" unique_id=1114087117] libraries/ = SubResource("AnimationLibrary_3cvbl") +[node name="audio" parent="texture" index="1" unique_id=1167114186] +max_distance = 10000.0 + [node name="hitbox" parent="." index="1" unique_id=175349408] shape = SubResource("CapsuleShape2D_v6780") diff --git a/resources/sounds/effect/fireshot.mp3 b/resources/sounds/effect/fireshot.mp3 new file mode 100644 index 0000000..4b3f962 Binary files /dev/null and b/resources/sounds/effect/fireshot.mp3 differ diff --git a/resources/sounds/effect/fireshot.mp3.import b/resources/sounds/effect/fireshot.mp3.import new file mode 100644 index 0000000..ff193c0 --- /dev/null +++ b/resources/sounds/effect/fireshot.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://b0emg4tbjpl1l" +path="res://.godot/imported/fireshot.mp3-524623288bedd020cdc089501c081040.mp3str" + +[deps] + +source_file="res://resources/sounds/effect/fireshot.mp3" +dest_files=["res://.godot/imported/fireshot.mp3-524623288bedd020cdc089501c081040.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/scripts/Contents/Bullets/InfinitySword.gd b/scripts/Contents/Bullets/InfinitySword.gd index 3f87338..61345b2 100644 --- a/scripts/Contents/Bullets/InfinitySword.gd +++ b/scripts/Contents/Bullets/InfinitySword.gd @@ -3,6 +3,8 @@ class_name InfinitySwordBullet var implused: Array[EntityBase] = [] +func spawn(): + CameraManager.shake(2000, 100) func ai(): PresetBulletAI.forward(self , rotation) func succeedToHit(_dmg: float, entity: EntityBase):