Skip to content

Fixes for bugs related to the toggling of FireShield, FlashShield, and SporePuffCrestBuff #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Aissurteivos wants to merge 1 commit into
base: V1.1-(1.10)
Choose a base branch
from
Open

Fixes for bugs related to the toggling of FireShield, FlashShield, and SporePuffCrestBuff #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions BuildInBuff/Positive/FireShieldBuff.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,21 @@ public FireShieldBuff()
}
}
}

public override bool Trigger(RainWorldGame game)
{
bool? state = null;
foreach (var player in FireShieldBuffEntry.PlayerList)
{
if (!FireShieldBuffEntry.FireShieldStateFeatures.TryGetValue(player, out var fireShieldState)) continue;
if (state is null) state = fireShieldState.IsActivate;
if (state.Value)
fireShieldState.Deactivate();
else
fireShieldState.Activate();
}
return false;
}
}

internal class FireShieldBuffData : BuffData
Expand Down Expand Up @@ -282,18 +297,6 @@ public FireShieldState(Player c)

public void Update()
{
foreach (var player in FireShieldBuffEntry.PlayerList)
{
if (FireShieldBuffEntry.FireShieldStateFeatures.TryGetValue(player, out var fireShield) &&
BuffInput.GetKeyDown(FireShieldBuff.Instance.GetBindKey()))
{
FireShieldBuff.Instance.TriggerSelf(true);
if (fireShield.IsActivate)
fireShield.Deactivate();
else if (!fireShield.IsActivate)
fireShield.Activate();
}
}
}

public void Activate()
Expand Down
27 changes: 15 additions & 12 deletions BuildInBuff/Positive/FlashShieldBuff.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,21 @@ public FlashShieldBuff()
}
}
}

public override bool Trigger(RainWorldGame game)
{
bool? state = null;
foreach (var player in FlashShieldBuffEntry.PlayerList)
{
if (!FlashShieldBuffEntry.FlashShieldStateFeatures.TryGetValue(player, out var flashShield)) continue;
if (state is null) state = flashShield.IsActivate;
if (state.Value)
flashShield.Deactivate();
else
flashShield.Activate();
}
return false;
}
}

internal class FlashShieldBuffData : BuffData
Expand Down Expand Up @@ -563,18 +578,6 @@ public FlashShieldState(Player c)

public void Update()
{
foreach (var player in FlashShieldBuffEntry.PlayerList)
{
if (FlashShieldBuffEntry.FlashShieldStateFeatures.TryGetValue(player, out var flashShield) &&
BuffInput.GetKeyDown(FlashShieldBuff.Instance.GetBindKey()))
{
FlashShieldBuff.Instance.TriggerSelf(true);
if (flashShield.IsActivate)
flashShield.Deactivate();
else if (!flashShield.IsActivate)
flashShield.Activate();
}
}
}

public void Activate()
Expand Down
15 changes: 7 additions & 8 deletions BuildInBuff/Positive/SporePuff'sCrestBuff.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,15 @@ public SporePuff_sCrestBuff()

public override bool Trigger(RainWorldGame game)
{
bool? state = null;
foreach (var player in SporePuff_sCrestBuffEntry.PlayerList)
{
if (SporePuff_sCrestBuffEntry.SporePuff_sCrestStateFeatures.TryGetValue(player, out var sporePuff_sCrest) &&
BuffInput.GetKeyDown(GetBindKey()))
{
if (sporePuff_sCrest.IsActivate)
sporePuff_sCrest.Deactivate();
else if (!sporePuff_sCrest.IsActivate)
sporePuff_sCrest.Activate();
}
if (!SporePuff_sCrestBuffEntry.SporePuff_sCrestStateFeatures.TryGetValue(player, out var sporePuff_sCrest)) continue;
if (state is null) state = sporePuff_sCrest.IsActivate;
if (state.Value)
sporePuff_sCrest.Deactivate();
else
sporePuff_sCrest.Activate();
}
return false;
}
Expand Down
4 changes: 2 additions & 2 deletions RandomBuff/Render/UI/CardInteractionManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ public override IEnumerable<Vector2> GetAllFocusableObjectPos()
public class KeyBinderProcessor
{
public List<BuffID> triggerableBuffIDs = new List<BuffID>();
Dictionary<BuffID, bool>lastKeyDowns = new Dictionary<BuffID, bool>();
static Dictionary<BuffID, bool>lastKeyDowns = new Dictionary<BuffID, bool>();

InGameSlotInteractionManager manager;

Expand All @@ -676,7 +676,7 @@ public void AppendCard(BuffCard card)
if(card.StaticData.Triggerable)
{
triggerableBuffIDs.Add(card.ID);
lastKeyDowns.Add(card.ID, false);
lastKeyDowns[card.ID] = false;
}
}

Expand Down