diff --git a/components/Characters/Rooster.tscn b/components/Characters/Rooster.tscn index 9f36d0b..6250d1a 100644 --- a/components/Characters/Rooster.tscn +++ b/components/Characters/Rooster.tscn @@ -6,7 +6,9 @@ [ext_resource type="PackedScene" uid="uid://cx7nogfnv7s8t" path="res://components/Weapons/Tree.tscn" id="4_0omr3"] [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="PackedScene" uid="uid://yq7vmijwvgx1" path="res://components/Weapons/AcidWind.tscn" id="5_jluqw"] [ext_resource type="AudioStream" uid="uid://dmxh3bpk8vyy5" path="res://resources/sounds/effect/Coin.mp3" id="5_xnbhq"] +[ext_resource type="PackedScene" uid="uid://bm5sw6mr71acq" path="res://components/Weapons/HXD.tscn" id="6_fkh3f"] [ext_resource type="AudioStream" uid="uid://4wuuf1osk0yv" path="res://resources/sounds/effect/Low Boing.wav" id="6_m5px1"] [ext_resource type="Texture2D" uid="uid://fn8qx72clh38" path="res://resources/characters/cock/rooster-a.svg" id="8_da2ca"] [ext_resource type="Texture2D" uid="uid://ci2ik43ce82uy" path="res://resources/characters/cock/rooster-b.svg" id="9_0omr3"] @@ -108,6 +110,12 @@ debugRebuild = false [node name="Tree" parent="weaponStore" index="1" unique_id=185228402 instance=ExtResource("4_0omr3")] debugRebuild = false +[node name="AcidWind" parent="weaponStore" index="2" unique_id=1072098623 instance=ExtResource("5_jluqw")] +debugRebuild = false + +[node name="HXD" parent="weaponStore" index="3" unique_id=1383383596 instance=ExtResource("6_fkh3f")] +debugRebuild = false + [node name="sprint" parent="sounds" index="0"] stream = ExtResource("4_66s6c") diff --git a/scripts/Statemachine/SkillIcon.gd b/scripts/Statemachine/SkillIcon.gd index c6d0754..4267a02 100644 --- a/scripts/Statemachine/SkillIcon.gd +++ b/scripts/Statemachine/SkillIcon.gd @@ -15,7 +15,7 @@ func _physics_process(_delta): textureRect.texture = weapon.avatarTexture var progress = min(weapon.cooldownTimer.percent(), UIState.player.fillingProgress(weapon.needEnergy)) material.set_shader_parameter("progress", progress) - particle.emitting = progress >= 1 + particle.emitting = weapon.canAttackBy(UIState.player) if progress >= 1: if !showed: showed = true