maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-21 17:03:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Weapon switching

Browse source
This commit is contained in:
MaddoScientisto 2025-04-09 23:24:55 +02:00
commit 036cc4b940
10 changed files with 49 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Resources/BossPhases/Rumia_SP1.tres
View file

@ -45,6 +45,7 @@ LifeTime = 20.0
DestroyOnCollision = false DestroyOnCollision = false
Owner = 2 Owner = 2
DamageType = 0 DamageType = 0
RotateSprite = false
Controllable = false Controllable = false
Grazeable = true Grazeable = true
GrazeValue = 1.0 GrazeValue = 1.0
@ -91,6 +92,7 @@ LifeTime = 20.0
DestroyOnCollision = false DestroyOnCollision = false
Owner = 2 Owner = 2
DamageType = 0 DamageType = 0
RotateSprite = false
Controllable = false Controllable = false
Grazeable = true Grazeable = true
GrazeValue = 1.0 GrazeValue = 1.0

1
Resources/Bullets/Boss/Rumia/LaserBulletTest.tres
View file

@ -29,6 +29,7 @@ LifeTime = 20.0
DestroyOnCollision = false DestroyOnCollision = false
Owner = 2 Owner = 2
DamageType = 0 DamageType = 0
RotateSprite = false
Controllable = false Controllable = false
Grazeable = false Grazeable = false
GrazeValue = 0.2 GrazeValue = 0.2

1
Resources/Bullets/Boss/Rumia/Rumia_Red_Chase_Bullet.tres
View file

@ -26,6 +26,7 @@ LifeTime = 20.0
DestroyOnCollision = true DestroyOnCollision = true
Owner = 2 Owner = 2
DamageType = 0 DamageType = 0
RotateSprite = false
Controllable = false Controllable = false
Grazeable = true Grazeable = true
GrazeValue = 0.2 GrazeValue = 0.2

1
Resources/Bullets/cheat_bullet.tres
View file

@ -27,6 +27,7 @@ LifeTime = 10.0
DestroyOnCollision = true DestroyOnCollision = true
Owner = 1 Owner = 1
DamageType = 0 DamageType = 0
RotateSprite = false
Controllable = false Controllable = false
Grazeable = false Grazeable = false
GrazeValue = 1.0 GrazeValue = 1.0

1
Resources/Bullets/yin_yang_bullet.tres
View file

@ -27,6 +27,7 @@ LifeTime = 10.0
DestroyOnCollision = true DestroyOnCollision = true
Owner = 1 Owner = 1
DamageType = 1 DamageType = 1
RotateSprite = false
Controllable = false Controllable = false
Grazeable = false Grazeable = false
GrazeValue = 1.0 GrazeValue = 1.0

3
Resources/Patterns/rumia_ns_2.tres
View file

@ -17,6 +17,7 @@ LifeTime = 20.0
DestroyOnCollision = false DestroyOnCollision = false
Owner = 2 Owner = 2
DamageType = 0 DamageType = 0
RotateSprite = false
Controllable = false Controllable = false
Grazeable = true Grazeable = true
GrazeValue = 1.0 GrazeValue = 1.0
@ -54,6 +55,7 @@ LifeTime = 20.0
DestroyOnCollision = false DestroyOnCollision = false
Owner = 2 Owner = 2
DamageType = 0 DamageType = 0
RotateSprite = false
Controllable = false Controllable = false
Grazeable = true Grazeable = true
GrazeValue = 1.0 GrazeValue = 1.0
@ -91,6 +93,7 @@ LifeTime = 20.0
DestroyOnCollision = false DestroyOnCollision = false
Owner = 2 Owner = 2
DamageType = 0 DamageType = 0
RotateSprite = false
Controllable = false Controllable = false
Grazeable = true Grazeable = true
GrazeValue = 1.0 GrazeValue = 1.0

1
Resources/Weapons/Enemy/TurretWeapon.tres
View file

@ -20,6 +20,7 @@ LifeTime = 10.0
DestroyOnCollision = true DestroyOnCollision = true
Owner = 2 Owner = 2
DamageType = 0 DamageType = 0
RotateSprite = false
Controllable = false Controllable = false
Grazeable = true Grazeable = true
GrazeValue = 1.0 GrazeValue = 1.0

42
Scenes/test.tscn
View file

File diff suppressed because one or more lines are too long

2
Scripts/Components/Actors/PlayerWeaponProvider.cs
View file

@ -9,7 +9,7 @@ namespace Cirno.Scripts.Components.Actors;
public partial class PlayerWeaponProvider : Node2D public partial class PlayerWeaponProvider : Node2D
{ {
[Export] public PackedScene WeaponTemplate { get; private set; } [Export] public PackedScene WeaponTemplate { get; private set; }
public Array<Weapon> EquippedWeapons { get; set; } = new Array<Weapon>(); public Array<Weapon> EquippedWeapons { get; set; } = [];
public int CurrentWeaponIndex { get; set; } = 0; public int CurrentWeaponIndex { get; set; } = 0;
private InventoryManager _inventoryManager; private InventoryManager _inventoryManager;

12
Scripts/Components/FSM/Player/Active.cs
View file

@ -187,4 +187,16 @@ public partial class Active : PlayerStateBase
{ {
_activationProvider.HandleInteraction(); _activationProvider.HandleInteraction();
} }
private void HandleWeaponSwitch()
{
if (_inputProvider.GetWeaponNextJustPressed())
{
_weaponProvider.NextWeapon();
}
else if (_inputProvider.GetWeaponPreviousJustPressed())
{
_weaponProvider.PreviousWeapon();
}
}
} }