GKaszewski/parasitic-god
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add buff management for miracles; implement checks for active buffs and update buff identifiers

Browse Source
This commit is contained in:
Gabriel Kaszewski
2025-08-23 18:28:05 +02:00
parent 73a89b736e
commit 8ae0e7e80c
11 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Mods/Miracles/gods_endurance.json
View File

@@ -7,6 +7,7 @@
"effects": [
{
"type": "ApplyBuff",
"buffId": "gods_endurance",
"targetStat": "FaithPerFollower",
"multiplier": 2.0,
"duration": 60

1
Mods/Miracles/harness_the_sun.json
View File

@@ -7,6 +7,7 @@
"effects": [
{
"type": "ApplyBuff",
"buffId": "harness_the_sun",
"targetStat": "CorruptionPerSecond",
"multiplier": -1.5,
"duration": 120

17
Scenes/Main/MiracleButton.cs
View File

@@ -85,6 +85,11 @@ public partial class MiracleButton : Button
{
missingRequirements.Add("Already unlocked subsequent powers.");
}
if (IsBuffAlreadyActive(state))
{
missingRequirements.Add("This buff is already active.");
}
if (missingRequirements.Any())
{
@@ -145,4 +150,16 @@ public partial class MiracleButton : Button
return unlockEffect.MiraclesToUnlock.All(state.IsMiracleUnlocked);
}
private bool IsBuffAlreadyActive(GameState state)
{
var buffEffect = _miracle.Effects.OfType<ApplyBuffEffect>().FirstOrDefault();
if (buffEffect == null || string.IsNullOrEmpty(buffEffect.BuffId))
{
return false;
}
return state.IsBuffActive(buffEffect.BuffId);
}
}

6
Scripts/Components/ActiveBuffsManager.cs
View File

@@ -34,16 +34,16 @@ public partial class ActiveBuffsManager : Node
var buffInstance = _activeBuffScene.Instantiate<ActiveBuffUi>();
AddChild(buffInstance);
buffInstance.SetBuff(buff);
_activeBuffUis.Add(buff.Id, buffInstance);
_activeBuffUis.Add(buff.InstanceId, buffInstance);
_buffAddedSfx?.Play();
}
private void OnBuffRemoved(Buff buff)
{
if (_activeBuffUis.TryGetValue(buff.Id, out var buffUi))
if (_activeBuffUis.TryGetValue(buff.InstanceId, out var buffUi))
{
buffUi.QueueFree();
_activeBuffUis.Remove(buff.Id);
_activeBuffUis.Remove(buff.InstanceId);
_buffRemovedSfx?.Play();
}
}

8
Scripts/Core/Effects/ApplyBuffEffect.cs
View File

@@ -6,12 +6,19 @@ namespace ParasiticGod.Scripts.Core.Effects;
[GlobalClass]
public partial class ApplyBuffEffect : Effect
{
[Export] public string BuffId { get; set; }
[Export] public Stat TargetStat { get; set; }
[Export] public float Multiplier { get; set; } = 2.0f;
[Export] public double Duration { get; set; } = 30.0;
public override void Execute(GameState gameState)
{
if (gameState.IsBuffActive(BuffId))
{
GD.Print($"Buff '{BuffId}' is already active. Cannot apply again.");
return;
}
var newBuff = new Buff
{
Name = $"{TargetStat} x{Multiplier}",
@@ -20,6 +27,7 @@ public partial class ApplyBuffEffect : Effect
};
gameState.ActiveBuffs.Add(newBuff);
gameState.AddActiveBuff(BuffId);
GameBus.Instance.NotifyBuffAdded(newBuff);
}

3
Scripts/Core/Effects/Buff.cs
View File

@@ -4,7 +4,8 @@ namespace ParasiticGod.Scripts.Core.Effects;
public class Buff
{
public Guid Id { get; } = Guid.NewGuid(); // Unique identifier
public Guid InstanceId { get; } = Guid.NewGuid(); // Unique identifier
public string BuffId { get; set; } // Identifier for the type of buff
public string Name { get; set; } // For display purposes
public float Multiplier { get; set; } = 1.0f;
public double Duration { get; set; }

2
Scripts/Core/GameLogic.cs
View File

@@ -17,6 +17,7 @@ public class GameLogic
state.Modify(Stat.Faith, faithPerSecond * delta);
state.Modify(Stat.Production, state.Get(Stat.ProductionPerSecond) * delta);
state.Modify(Stat.Corruption, state.Get(Stat.CorruptionPerSecond) * delta);
state.Modify(Stat.Followers, state.Get(Stat.FollowersPerSecond) * delta);
for (var i = state.ActiveBuffs.Count - 1; i >= 0; i--)
{
@@ -26,6 +27,7 @@ public class GameLogic
{
GameBus.Instance.NotifyBuffRemoved(buff);
state.ActiveBuffs.RemoveAt(i);
state.RemoveActiveBuff(buff.BuffId);
}
}
}

5
Scripts/Core/GameState.cs
View File

@@ -8,6 +8,7 @@ public class GameState
{
private readonly Dictionary<Stat, StatData> _stats = new();
private readonly HashSet<string> _unlockedMiracleIds = [];
private readonly HashSet<string> _activeBuffIds = [];
public List<Buff> ActiveBuffs { get; } = [];
@@ -38,4 +39,8 @@ public class GameState
public bool IsMiracleUnlocked(string miracleId) => _unlockedMiracleIds.Contains(miracleId);
public void AddUnlockedMiracle(string miracleId) => _unlockedMiracleIds.Add(miracleId);
public void RemoveUnlockedMiracle(string miracleId) => _unlockedMiracleIds.Remove(miracleId);
public bool IsBuffActive(string buffId) => _activeBuffIds.Contains(buffId);
public void AddActiveBuff(string buffId) => _activeBuffIds.Add(buffId);
public void RemoveActiveBuff(string buffId) => _activeBuffIds.Remove(buffId);
}

1
Scripts/Core/MiracleDto.cs
View File

@@ -12,6 +12,7 @@ public class EffectDto
public double Value { get; set; }
// --- For "ApplyBuff" Effect ---
public string BuffId { get; set; }
public float Multiplier { get; set; }
public double Duration { get; set; }

1
Scripts/Core/MiracleLoader.cs
View File

@@ -101,6 +101,7 @@ public static class MiracleLoader
applyBuffEffect.TargetStat = effectDto.TargetStat;
applyBuffEffect.Multiplier = effectDto.Multiplier;
applyBuffEffect.Duration = effectDto.Duration;
applyBuffEffect.BuffId = effectDto.BuffId;
break;
case ConvertResourceEffect convertResourceEffect:
convertResourceEffect.FromResource = effectDto.FromResource;

1
Scripts/Core/Stat.cs
View File

@@ -11,6 +11,7 @@ public enum Stat
// Passive Generation Stats
ProductionPerSecond,
CorruptionPerSecond,
FollowersPerSecond,
// Modifying Stats
FaithPerFollower