From 3b9522eae40bd4249deebfe6b550f322b5aa8a76 Mon Sep 17 00:00:00 2001 From: HumanoidSandvichDispenser Date: Sun, 25 Aug 2024 23:57:15 -0700 Subject: [PATCH] Add alt fire to RangedIdleState --- Entities/Arrow.tscn | 5 ++--- State/Weapon/RangedIdleState.cs | 9 +++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Entities/Arrow.tscn b/Entities/Arrow.tscn index 156bcfe..8bbc7a9 100644 --- a/Entities/Arrow.tscn +++ b/Entities/Arrow.tscn @@ -17,11 +17,9 @@ gradient = SubResource("Gradient_uqfn8") [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_yg5po"] particle_flag_disable_z = true direction = Vector3(-1, 0, 0) -gravity = Vector3(0, 0, 0) initial_velocity_min = 4.0 initial_velocity_max = 8.0 -orbit_velocity_min = 0.0 -orbit_velocity_max = 0.0 +gravity = Vector3(0, 0, 0) scale_min = 2.0 scale_max = 2.0 color_ramp = SubResource("GradientTexture1D_te0n4") @@ -41,6 +39,7 @@ texture = ExtResource("1_0im1r") centered = false [node name="Hitbox" parent="." instance=ExtResource("3_f4lib")] +priority = 5 [node name="CollisionShape2D" parent="Hitbox" index="0"] position = Vector2(0, -0.5) diff --git a/State/Weapon/RangedIdleState.cs b/State/Weapon/RangedIdleState.cs index 2113aca..42fff02 100644 --- a/State/Weapon/RangedIdleState.cs +++ b/State/Weapon/RangedIdleState.cs @@ -8,6 +8,9 @@ public partial class RangedIdleState : WeaponState [Export] public WeaponState FireState { get; set; } + [Export] + public WeaponState AltFireState { get; set; } + [Export] public Items.Weapons.Ranged Weapon { get; set; } @@ -30,6 +33,12 @@ public partial class RangedIdleState : WeaponState return FireState; } + public override WeaponState UseAlt() + { + GD.Print("Alt fire"); + return AltFireState; + } + public override void Exit(IState nextState) { Weapon.Visible = true;