Skip to content

Commit 137c6b0

Browse files
committed
support double blades' second blade
1 parent 7fb33bd commit 137c6b0

File tree

1 file changed

+18
-3
lines changed

1 file changed

+18
-3
lines changed

OneShot/Main.cs

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,16 @@ public static void OneUseBlades(ForceField __instance, Collision2D other)
6161
if (blades == null) return;
6262
foreach (var blade in blades)
6363
{
64-
if (blade.particleField.forceField.GetInstanceID() != __instance.GetInstanceID()) continue;
64+
if (blade.GetType() == typeof(DoubleParticleBlade))
65+
{
66+
if (blade.particleField.forceField.GetInstanceID() != __instance.GetInstanceID() &&
67+
((DoubleParticleBlade) blade).secondaryParticleField.forceField.GetInstanceID() !=
68+
__instance.GetInstanceID()) continue;
69+
}
70+
else
71+
{
72+
if (blade.particleField.forceField.GetInstanceID() != __instance.GetInstanceID()) continue;
73+
}
6574
blade.Disintegrate();
6675
}
6776
}
@@ -80,9 +89,15 @@ public static void OneReflect(RaycastHit2D hit)
8089
if (blades == null) return;
8190
foreach (var blade in blades)
8291
{
83-
if (blade.particleField.forceField.GetInstanceID() != forceField.GetInstanceID())
92+
if (blade.GetType() == typeof(DoubleParticleBlade))
93+
{
94+
if (blade.particleField.forceField.GetInstanceID() != forceField.GetInstanceID() &&
95+
((DoubleParticleBlade) blade).secondaryParticleField.forceField.GetInstanceID() !=
96+
forceField.GetInstanceID()) continue;
97+
}
98+
else
8499
{
85-
continue;
100+
if (blade.particleField.forceField.GetInstanceID() != forceField.GetInstanceID()) continue;
86101
}
87102
blade.Disintegrate();
88103
}

0 commit comments

Comments
 (0)