diff --git a/components/Abstracts/EntityBase.tscn b/components/Abstracts/EntityBase.tscn index e6f47ea..928d298 100644 --- a/components/Abstracts/EntityBase.tscn +++ b/components/Abstracts/EntityBase.tscn @@ -231,3 +231,4 @@ position = Vector2(0, -20) [node name="movebox" type="CollisionShape2D" parent="."] shape = SubResource("CircleShape2D_34h7q") +disabled = true diff --git a/components/Characters/Rooster.tscn b/components/Characters/Rooster.tscn index 8cec615..cf26c06 100644 --- a/components/Characters/Rooster.tscn +++ b/components/Characters/Rooster.tscn @@ -8,7 +8,7 @@ [ext_resource type="AudioStream" uid="uid://cdrevrq7n6yqa" path="res://resources/sounds/effect/Boing.mp3" id="4_66s6c"] [ext_resource type="AudioStream" uid="uid://benyec5bqni0b" path="res://resources/sounds/effect/Chomp.wav" id="4_k0yme"] [ext_resource type="AudioStream" uid="uid://dmxh3bpk8vyy5" path="res://resources/sounds/effect/Coin.mp3" id="5_xnbhq"] -[ext_resource type="AudioStream" uid="uid://des7x0l4f3ijc" path="res://resources/sounds/effect/Low Boing.mp3" id="6_nmmw2"] +[ext_resource type="AudioStream" uid="uid://4wuuf1osk0yv" path="res://resources/sounds/effect/Low Boing.wav" id="6_m5px1"] [sub_resource type="SpriteFrames" id="SpriteFrames_4v2ol"] animations = [{ @@ -50,7 +50,7 @@ stream = ExtResource("4_k0yme") stream = ExtResource("5_xnbhq") [node name="hurt" parent="sounds" index="3"] -stream = ExtResource("6_nmmw2") +stream = ExtResource("6_m5px1") [node name="attack0" parent="sounds" index="4"] stream = ExtResource("3_4syso") @@ -70,6 +70,3 @@ position = Vector2(54, -45) [node name="statebar" parent="." index="2" node_paths=PackedStringArray("entity")] position = Vector2(0, -151) entity = NodePath("..") - -[node name="movebox" parent="." index="3"] -disabled = true diff --git a/resources/sounds/effect/Low Boing.mp3 b/resources/sounds/effect/Low Boing.mp3 deleted file mode 100644 index 68049f6..0000000 Binary files a/resources/sounds/effect/Low Boing.mp3 and /dev/null differ diff --git a/resources/sounds/effect/Low Boing.mp3.import b/resources/sounds/effect/Low Boing.mp3.import deleted file mode 100644 index 859c0af..0000000 --- a/resources/sounds/effect/Low Boing.mp3.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -uid="uid://des7x0l4f3ijc" -path="res://.godot/imported/Low Boing.mp3-0d7a95e69d755f2863239a9cb4083223.mp3str" - -[deps] - -source_file="res://resources/sounds/effect/Low Boing.mp3" -dest_files=["res://.godot/imported/Low Boing.mp3-0d7a95e69d755f2863239a9cb4083223.mp3str"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/resources/sounds/effect/Low Boing.wav b/resources/sounds/effect/Low Boing.wav new file mode 100644 index 0000000..c1e773d Binary files /dev/null and b/resources/sounds/effect/Low Boing.wav differ diff --git a/resources/sounds/effect/Low Boing.wav.import b/resources/sounds/effect/Low Boing.wav.import new file mode 100644 index 0000000..a3cd1aa --- /dev/null +++ b/resources/sounds/effect/Low Boing.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://4wuuf1osk0yv" +path="res://.godot/imported/Low Boing.wav-77ba2997ec1fde807e119827deea2e73.sample" + +[deps] + +source_file="res://resources/sounds/effect/Low Boing.wav" +dest_files=["res://.godot/imported/Low Boing.wav-77ba2997ec1fde807e119827deea2e73.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/scripts/Statemachine/ItemDropped.gd b/scripts/Statemachine/ItemDropped.gd index 0399605..7366fac 100644 --- a/scripts/Statemachine/ItemDropped.gd +++ b/scripts/Statemachine/ItemDropped.gd @@ -7,6 +7,8 @@ var targetPlayer: EntityBase = null @onready var texture: Sprite2D = $"%texture" +func _ready(): + apply_force(MathTool.randv2_range(20000), MathTool.randv2_range(10)) func _process(_delta): texture.texture = ItemStore.getTexture(item) func _physics_process(_delta): @@ -14,6 +16,7 @@ func _physics_process(_delta): targetPlayer = findPlayer() if is_instance_valid(targetPlayer): apply_central_force((targetPlayer.position - position).normalized() * 1000) + func findPlayer() -> EntityBase: var result = null var lastDistance = INF