Skip to content

Fixed ShatterSentinel magic spell #29

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
Evyatar108 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed ShatterSentinel magic spell #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9327239
Fixed ShatterSentinel magic spell
Evyatar108 May 17, 2021
bcc8d35
Update Verb_ShatterSentinel.cs
Evyatar108 May 17, 2021
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
18 changes: 7 additions & 11 deletions Source/TMagic/TMagic/Verb_ShatterSentinel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ public class Verb_ShatterSentinel : Verb_UseAbility
{
protected override bool TryCastShot()
{
Pawn caster = base.CasterPawn;
Pawn pawn = this.currentTarget.Thing as Pawn;

CompAbilityUserMagic comp = pawn.GetComp<CompAbilityUserMagic>();
if(comp.IsMagicUser)
if (comp.IsMagicUser)
{
if(comp.summonedSentinels.Count > 0)
if (comp.summonedSentinels.Count > 0)
{
for(int i =0; i < comp.summonedSentinels.Count; i++)
var toRemove = new HashSet<Thing>();
for (int i = 0; i < comp.summonedSentinels.Count; i++)
{
Thing sentinel = comp.summonedSentinels[i];
if (!sentinel.DestroyedOrNull())
Expand All @@ -33,15 +33,11 @@ protected override bool TryCastShot()
sentinel.Destroy(DestroyMode.Vanish);
}
}
else
{
comp.summonedSentinels.Remove(comp.summonedSentinels[i]);
}

toRemove.Add(sentinel);
}
}
else
{

comp.summonedSentinels.RemoveAll(toRemove.Contains);
}
}
return true;
Expand Down