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

Item Effects system

Browse source
This commit is contained in:
Marco 2025-03-17 16:20:22 +01:00
commit dae952af8b
15 changed files with 255 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Resources/Items/Heart_Pickup.tres
View file

@ -1,7 +1,14 @@
[gd_resource type="Resource" script_class="LootItem" load_steps=3 format=3 uid="uid://dodwpect0ldjf"]
[gd_resource type="Resource" script_class="LootItem" load_steps=5 format=3 uid="uid://dodwpect0ldjf"]
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="1_hyh2l"]
[ext_resource type="Texture2D" uid="uid://dlkqy5jgchwy" path="res://Sprites/Items/Heart_Pickup.png" id="1_xg75n"]
[ext_resource type="Script" uid="uid://bxgjw8wis5l0t" path="res://Scripts/Resources/ItemEffects/HealPercentEffectResource.cs" id="2_yj7ej"]
[sub_resource type="Resource" id="Resource_vsvqq"]
script = ExtResource("2_yj7ej")
HealPercentage = 25.0
ResourceType = 0
metadata/_custom_type_script = "uid://bxgjw8wis5l0t"
[resource]
script = ExtResource("1_hyh2l")
@ -9,6 +16,7 @@ ItemName = &"Health"
ItemDescription = &"Gives back 25% of Max Health on use"
ItemKey = &"HEALTH"
Item = 4
ItemEffect = SubResource("Resource_vsvqq")
Amount = 1
Max = 10
PickupIfMaxed = false

10
Resources/Items/Shield_Pickup.tres
View file

@ -1,14 +1,22 @@
[gd_resource type="Resource" script_class="LootItem" load_steps=3 format=3 uid="uid://bhbufxodybsw4"]
[gd_resource type="Resource" script_class="LootItem" load_steps=5 format=3 uid="uid://bhbufxodybsw4"]
[ext_resource type="Texture2D" uid="uid://8n23xie4kore" path="res://Sprites/Items/Shield_Pickup.png" id="1_0hq6q"]
[ext_resource type="Script" uid="uid://bxgjw8wis5l0t" path="res://Scripts/Resources/ItemEffects/HealPercentEffectResource.cs" id="2_mvfwl"]
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="2_xsuq5"]
[sub_resource type="Resource" id="Resource_qh6j2"]
script = ExtResource("2_mvfwl")
HealPercentage = 25.0
ResourceType = 1
metadata/_custom_type_script = "uid://bxgjw8wis5l0t"
[resource]
script = ExtResource("2_xsuq5")
ItemName = &"Shield Charge"
ItemDescription = &"Recharges the shield by 25%"
ItemKey = &"SHIELD"
Item = 8
ItemEffect = SubResource("Resource_qh6j2")
Amount = 1
Max = 10
PickupIfMaxed = false

8
Resources/Items/Spider_Bomb_Pickup.tres
View file

@ -1,14 +1,19 @@
[gd_resource type="Resource" script_class="LootItem" load_steps=7 format=3 uid="uid://dhbltvgsa3g88"]
[gd_resource type="Resource" script_class="LootItem" load_steps=9 format=3 uid="uid://dhbltvgsa3g88"]
[ext_resource type="Texture2D" uid="uid://r2h77ktff10m" path="res://Sprites/Bullets/Snowball.png" id="1_gpot4"]
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="1_lus3u"]
[ext_resource type="Script" uid="uid://b6fmrnipv88bk" path="res://Scripts/Resources/WeaponResource.cs" id="1_qd764"]
[ext_resource type="Script" uid="uid://cyipg3seetrxd" path="res://Scripts/Resources/ItemEffects/SpiderbombEffectResource.cs" id="2_6b2qd"]
[ext_resource type="Resource" uid="uid://dwxn7f1ue0m4s" path="res://Resources/Bullets/Spider_Bomb_Bullet.tres" id="2_gpot4"]
[sub_resource type="AtlasTexture" id="AtlasTexture_gpot4"]
atlas = ExtResource("1_gpot4")
region = Rect2(0, 0, 16, 16)
[sub_resource type="Resource" id="Resource_2pgyg"]
script = ExtResource("2_6b2qd")
metadata/_custom_type_script = "uid://cyipg3seetrxd"
[sub_resource type="Resource" id="Resource_v5a4k"]
script = ExtResource("1_qd764")
Name = null
@ -32,6 +37,7 @@ ItemName = &"SnowBall Bomb"
ItemDescription = &"A snowball packed of explosive, explodes on contact"
ItemKey = &"SPIDER_BOMB"
Item = 5
ItemEffect = SubResource("Resource_2pgyg")
WeaponData = SubResource("Resource_v5a4k")
Amount = 1
Max = 10

170
Scripts/Components/FSM/Player/PlayerFSMItemUseModule.cs
View file

@ -36,6 +36,7 @@ public partial class PlayerFSMItemUseModule : ModuleBase<PlayerState, CharacterB
}
private IStateMachine<PlayerState, CharacterBody2D> _machine;
public IStateMachine<PlayerState, CharacterBody2D> Machine => _machine;
public override void Init(IStateMachine<PlayerState, CharacterBody2D> machine)
{
@ -46,91 +47,96 @@ public partial class PlayerFSMItemUseModule : ModuleBase<PlayerState, CharacterB
private void UseItem(LootItem item, int totalcount)
{
if (!Enabled) return;
GD.Print("Used spiderbomb in player");
switch (item.Item)
{
case ItemTypes.KeycardRed:
break;
case ItemTypes.KeycardBlue:
break;
case ItemTypes.KeycardGreen:
break;
case ItemTypes.Ammo:
break;
case ItemTypes.Medkit:
Heal(item);
break;
case ItemTypes.FrogBomb:
SpawnSpiderBomb(item);
break;
case ItemTypes.Bomb:
SpawnBomb(item);
break;
case ItemTypes.Mine:
break;
case ItemTypes.Battery:
RechargeShield(item);
break;
case ItemTypes.Weapon:
break;
case ItemTypes.Power:
break;
case ItemTypes.Points:
break;
case ItemTypes.Credits:
break;
case ItemTypes.KeyItem:
break;
}
GD.Print($"Used {item.ItemName} in player");
item.ItemEffect?.Execute(this, item);
return;
// switch (item.Item)
// {
// case ItemTypes.KeycardRed:
// break;
// case ItemTypes.KeycardBlue:
// break;
// case ItemTypes.KeycardGreen:
// break;
// case ItemTypes.Ammo:
// break;
// case ItemTypes.Medkit:
// Heal(item);
// break;
// case ItemTypes.FrogBomb:
// SpawnSpiderBomb(item);
// break;
// case ItemTypes.Bomb:
// SpawnBomb(item);
// break;
// case ItemTypes.Mine:
// break;
// case ItemTypes.Battery:
// RechargeShield(item);
// break;
// case ItemTypes.Weapon:
// break;
// case ItemTypes.Power:
// break;
// case ItemTypes.Points:
// break;
// case ItemTypes.Credits:
// break;
// case ItemTypes.KeyItem:
// break;
// }
}
private void SpawnBomb(LootItem item)
{
GD.Print("Spawned bomb");
}
private void Heal(LootItem item)
{
Health.CurrentResource += Mathf.CeilToInt(Health.MaxResource * 25 / 100);
}
private void RechargeShield(LootItem item)
{
Shield.CurrentResource += Mathf.CeilToInt(Health.MaxResource * 25 / 100);
}
private void SpawnSpiderBomb(LootItem item)
{
//var bullet = item.WeaponData.BulletData.BulletScene.Instantiate<Bullet>();
//bullet.Initialize(item.WeaponData.BulletData.MakeBullet(this.GlobalPosition, 1,0, 0), GameManager.Instance);
//InventoryManager.Instance.RemoveItem(item.ItemKey, 1);
// emit projectile
var bullet = this.CreateChildOf<Bullet>(GameManager.Instance.BulletsContainer, item.WeaponData.BulletData.BulletScene, this.GlobalPosition);
var bulletData = item.WeaponData.MakeBullet(this.GlobalPosition);
bullet.Initialize(bulletData, GameManager.Instance);
bullet.SetDirection(FacingDirection);
bullet.RotateSpriteDegrees(-90);
//bullet.SetDirection(_facingDirection);
bullet.Speed = item.WeaponData.BulletData.BulletSpeed;
_machine.SetState(PlayerState.Controlling);
//RequestMovementDisable(true);
// set camera
GameManager.Instance.CameraTargetObject(bullet);
// set event destroy
bullet.OnDestroy += () =>
{
GameManager.Instance.CameraTargetPlayer();
_machine.SetState(PlayerState.Active);
//RequestMovementDisable(false);
};
}
// private void SpawnBomb(LootItem item)
// {
// GD.Print("Spawned bomb");
// }
//
// private void Heal(LootItem item)
// {
// Health.CurrentResource += Mathf.CeilToInt(Health.MaxResource * 25 / 100);
// }
//
// private void RechargeShield(LootItem item)
// {
// Shield.CurrentResource += Mathf.CeilToInt(Health.MaxResource * 25 / 100);
// }
//
// private void SpawnSpiderBomb(LootItem item)
// {
// //var bullet = item.WeaponData.BulletData.BulletScene.Instantiate<Bullet>();
// //bullet.Initialize(item.WeaponData.BulletData.MakeBullet(this.GlobalPosition, 1,0, 0), GameManager.Instance);
//
//
// //InventoryManager.Instance.RemoveItem(item.ItemKey, 1);
// // emit projectile
// var bullet = this.CreateChildOf<Bullet>(GameManager.Instance.BulletsContainer, item.WeaponData.BulletData.BulletScene, this.GlobalPosition);
//
// var bulletData = item.WeaponData.MakeBullet(this.GlobalPosition);
//
// bullet.Initialize(bulletData, GameManager.Instance);
// bullet.SetDirection(FacingDirection);
// bullet.RotateSpriteDegrees(-90);
// //bullet.SetDirection(_facingDirection);
// bullet.Speed = item.WeaponData.BulletData.BulletSpeed;
//
// _machine.SetState(PlayerState.Controlling);
//
// //RequestMovementDisable(true);
// // set camera
// GameManager.Instance.CameraTargetObject(bullet);
// // set event destroy
// bullet.OnDestroy += () =>
// {
// GameManager.Instance.CameraTargetPlayer();
// _machine.SetState(PlayerState.Active);
// //RequestMovementDisable(false);
// };
// }
public override void Process(double delta)
{

41
Scripts/Resources/ItemEffects/HealEffectResource.cs Normal file
View file

@ -0,0 +1,41 @@
using System;
using Cirno.Scripts.Components.FSM.Player;
using Godot;
namespace Cirno.Scripts.Resources.ItemEffects;
[GlobalClass]
public partial class HealEffectResource : ItemEffectResource
{
[Export] public float HealAmount { get; private set; } = 10f;
[Export] public HealResourceType ResourceType { get; private set; } = HealResourceType.Health;
public override IITemEffectMachine Execute(PlayerFSMItemUseModule parent, LootItem item)
{
return new HealEffectmachine(this, parent, item).Execute();
}
public class HealEffectmachine(HealEffectResource resource, PlayerFSMItemUseModule parent, LootItem item)
: IITemEffectMachine
{
public IITemEffectMachine Execute()
{
switch (resource.ResourceType)
{
case HealResourceType.Health:
parent.Health.CurrentResource += resource.HealAmount;
break;
case HealResourceType.Shield:
parent.Shield.CurrentResource += resource.HealAmount;
break;
}
return this;
}
}
public enum HealResourceType
{
Health,
Shield
}
}

1
Scripts/Resources/ItemEffects/HealEffectResource.cs.uid Normal file
View file

@ -0,0 +1 @@
uid://ppuaa7avtsgq

33
Scripts/Resources/ItemEffects/HealPercentEffectResource.cs Normal file
View file

@ -0,0 +1,33 @@
using Cirno.Scripts.Components.FSM.Player;
using Godot;
namespace Cirno.Scripts.Resources.ItemEffects;
[GlobalClass]
public partial class HealPercentEffectResource : ItemEffectResource
{
[Export] public float HealPercentage = 25f;
[Export] public HealEffectResource.HealResourceType ResourceType { get; private set; } = HealEffectResource.HealResourceType.Health;
public override IITemEffectMachine Execute(PlayerFSMItemUseModule parent, LootItem item)
{
return new HealPercentEffectmachine(this, parent, item).Execute();
}
public class HealPercentEffectmachine(HealPercentEffectResource resource, PlayerFSMItemUseModule parent, LootItem item) : IITemEffectMachine
{
public IITemEffectMachine Execute()
{
switch (resource.ResourceType)
{
case HealEffectResource.HealResourceType.Health:
parent.Health.CurrentResource += Mathf.CeilToInt(parent.Health.MaxResource * resource.HealPercentage / 100);
break;
case HealEffectResource.HealResourceType.Shield:
parent.Shield.CurrentResource += Mathf.CeilToInt(parent.Shield.MaxResource * resource.HealPercentage / 100);
break;
}
return this;
}
}
}

1
Scripts/Resources/ItemEffects/HealPercentEffectResource.cs.uid Normal file
View file

@ -0,0 +1 @@
uid://bxgjw8wis5l0t

8
Scripts/Resources/ItemEffects/IITemEffectMachine.cs Normal file
View file

@ -0,0 +1,8 @@
using Cirno.Scripts.Components.FSM.Player;
namespace Cirno.Scripts.Resources.ItemEffects;
public interface IITemEffectMachine
{
public IITemEffectMachine Execute();
}

1
Scripts/Resources/ItemEffects/IITemEffectMachine.cs.uid Normal file
View file

@ -0,0 +1 @@
uid://bb8cess7hkvwg

10
Scripts/Resources/ItemEffects/ItemEffectResource.cs Normal file
View file

@ -0,0 +1,10 @@
using Cirno.Scripts.Components.FSM.Player;
using Godot;
namespace Cirno.Scripts.Resources.ItemEffects;
[GlobalClass]
public abstract partial class ItemEffectResource : Resource
{
public abstract IITemEffectMachine Execute(PlayerFSMItemUseModule parent, LootItem item);
}

1
Scripts/Resources/ItemEffects/ItemEffectResource.cs.uid Normal file
View file

@ -0,0 +1 @@
uid://cmkhe0q83rkmd

44
Scripts/Resources/ItemEffects/SpiderbombEffectResource.cs Normal file
View file

@ -0,0 +1,44 @@
using Cirno.Scripts.Components.FSM.Player;
using Godot;
namespace Cirno.Scripts.Resources.ItemEffects;
[GlobalClass]
public partial class SpiderbombEffectResource : ItemEffectResource
{
public override IITemEffectMachine Execute(PlayerFSMItemUseModule parent, LootItem item)
{
return new SpiderbombEffectmachine(this, parent, item).Execute();
}
public class SpiderbombEffectmachine(SpiderbombEffectResource resource, PlayerFSMItemUseModule parent, LootItem item) : IITemEffectMachine
{
public IITemEffectMachine Execute()
{
var bullet = parent.CreateChildOf<Bullet>(GameManager.Instance.BulletsContainer, item.WeaponData.BulletData.BulletScene, parent.GlobalPosition);
var bulletData = item.WeaponData.MakeBullet(parent.GlobalPosition);
bullet.Initialize(bulletData, GameManager.Instance);
bullet.SetDirection(parent.FacingDirection);
bullet.RotateSpriteDegrees(-90);
//bullet.SetDirection(_facingDirection);
bullet.Speed = item.WeaponData.BulletData.BulletSpeed;
parent.Machine.SetState(PlayerState.Controlling);
//RequestMovementDisable(true);
// set camera
GameManager.Instance.CameraTargetObject(bullet);
// set event destroy
bullet.OnDestroy += () =>
{
GameManager.Instance.CameraTargetPlayer();
parent.Machine.SetState(PlayerState.Active);
//RequestMovementDisable(false);
};
return this;
}
}
}

1
Scripts/Resources/ItemEffects/SpiderbombEffectResource.cs.uid Normal file
View file

@ -0,0 +1 @@
uid://cyipg3seetrxd

4
Scripts/Resources/LootItem.cs
View file

@ -1,4 +1,5 @@
using Godot;
using Cirno.Scripts.Resources.ItemEffects;
using Godot;
namespace Cirno.Scripts.Resources;
@ -9,6 +10,7 @@ public partial class LootItem : Resource
[Export] public StringName ItemDescription { get; set; }
[Export] public StringName ItemKey { get; set; }
[Export] public ItemTypes Item;
[Export] public ItemEffectResource ItemEffect { get; private set; }
[Export] public WeaponResource WeaponData { get; set; }
[Export] public int Amount;
[Export] public int Max;