maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-09 02:25:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Shooting

Browse source
This commit is contained in:
Marco 2025-06-18 18:09:30 +02:00
commit 341f76d885
17 changed files with 156 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Scripts/Components/Actors/KeyboardInputProvider.cs
View file

@ -47,7 +47,7 @@ public partial class KeyboardInputProvider : InputProvider
private void DelayedRegisterGameManager()
{
_mouseAImProvider = GetNodeOrNull<IMouseAimProvider>("MouseAimProvider");
_mouseAImProvider = this.GetParent().GetNodeOrNull<IMouseAimProvider>("MouseAimProvider");
if (_mouseAImProvider is null)
{
@ -57,10 +57,18 @@ public partial class KeyboardInputProvider : InputProvider
if (GameManager.Instance is null)
{
GD.Print("No GameManager found for keyboard inputprovider");
return;
}
else
{
GameManager.Instance.GameStateChange += InstanceOnGameStateChange;
}
GameManager.Instance.GameStateChange += InstanceOnGameStateChange;
if (GameController.Instance is not null)
{
GameController.Instance.GameStateChange += InstanceOnGameStateChange;
}
_enabled = true;
}

1
Scripts/Components/Actors/MouseAimProvider3D.cs
View file

@ -13,4 +13,5 @@ public partial class MouseAimProvider3D : Node3D, IMouseAimProvider
return mouseWorldPos - screenPosition;
}
}

2
Scripts/Components/FSM/3DPlayer/IsoMovementModule.cs
View file

@ -53,10 +53,12 @@ public partial class IsoMovementModule : ModuleBase<PlayerState, CharacterBody3D
if (rightStickInput.Length() > 0.1f) // If the right stick is moved
{
PlayerStorage.FacingDirection = rightStickInput;
PlayerStorage.AimingDirection = rightStickInput;
}
else if (movementInput != Vector2.Zero) // Fall back to movement direction
{
PlayerStorage.FacingDirection = movementInput;
PlayerStorage.AimingDirection = rightStickInput;
}
// }

6
Scripts/Components/FSM/3DPlayer/PlayerWeaponModule3D.cs
View file

@ -52,8 +52,10 @@ public partial class PlayerWeaponModule3D : ModuleBase<PlayerState, CharacterBod
return;
}
if (!InputProvider.GetShootPressed()) return;
WeaponProvider.Shoot(Storage.AimingDirection);
if (InputProvider.GetShootPressed())
{
WeaponProvider.Shoot(Storage.AimingDirection);
}
}
private void HandleWeaponSwitch()

7
Scripts/Components/FSM/3DPlayer/PlayerWeaponProvider3D.cs
View file

@ -221,9 +221,12 @@ public partial class PlayerWeaponProvider3D : Node
if (maybeExistingWeapon is not null) return maybeExistingWeapon;
var weapon = WeaponTemplate.Instantiate<Weapon3D>();
this.AddChild(weapon);
_parent.AddChild(weapon);
weapon.GlobalPosition = _parent.GlobalPosition;
//this.CreateSibling<Weapon>(WeaponTemplate);
weapon.WeaponData = startingItem.WeaponData;
weapon.WeaponData = startingItem.WeaponData3D;
weapon.Sprite.Texture = startingItem.InventorySprite;