Skip to content

Clean up FlyingObject_LightningTrap #36

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
noreenko wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Clean up FlyingObject_LightningTrap #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
af946b8
first pass at cleaning up FlyingObject_LightningTrap.cs
noreenko Oct 5, 2022
4e23ae7
Implement private strike class to make FlyingObject_LightningTrap.cs …
noreenko Oct 6, 2022
930acc7
Remove a bunch of unused code in FlyingObject_LightningTrap.cs and ge…
noreenko Oct 6, 2022
2a23a62
Add comment to flyingObject
noreenko Oct 6, 2022
fc95c39
Merge branch 'main' into Remove_unused_variables_on_FlyingObject_Ligh…
noreenko Dec 21, 2022
a41263a
Merge branch 'main' into Remove_unused_variables_on_FlyingObject_Ligh…
noreenko Feb 27, 2023
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
17 changes: 9 additions & 8 deletions RimWorldOfMagic/RimWorldOfMagic/Building_LightningTrap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ public class Building_LightningTrap : Building_ExplosiveProximityTrap
public bool extendedTrap = false;
public bool iceTrap = false;

private FlyingObject_LightningTrap flyingObject; // Used to prevent duplicate eye spawning only. Not saved.

public override void ExposeData()
{
base.ExposeData();
Expand All @@ -24,25 +26,24 @@ public override void ExposeData()

public override void Spring(Pawn p)
{
if (flyingObject != null) return; // Prevent duplicate lightning eyes from spawning. Very op.
base.Spring(p);
IntVec3 targetPos = this.Position;
IntVec3 targetPos = Position;
targetPos.z += 2;
LocalTargetInfo t = targetPos;
float speed = .8f;
if(extendedTrap)
{
speed = .6f;
}
if (t.Cell != default(IntVec3))
if (t.Cell != default)
{
Thing eyeThing = new Thing();
eyeThing.def = TorannMagicDefOf.FlyingObject_LightningTrap;
FlyingObject_LightningTrap flyingObject = (FlyingObject_LightningTrap)GenSpawn.Spawn(TorannMagicDefOf.FlyingObject_LightningTrap, this.Position, this.Map);
flyingObject.Launch(p, this.Position.ToVector3Shifted(), t.Cell, eyeThing, this.Faction, null, speed);
flyingObject = (FlyingObject_LightningTrap)GenSpawn.Spawn(TorannMagicDefOf.FlyingObject_LightningTrap, Position, Map);
flyingObject.Launch(p, Position.ToVector3Shifted(), t.Cell, Faction, speed);
}
if(iceTrap)
{
AddSnowRadial(this.Position, this.Map, 6, 1.1f);
AddSnowRadial(Position, Map, 6, 1.1f);
}
}

Expand Down Expand Up @@ -73,4 +74,4 @@ public override void Destroy(DestroyMode mode = DestroyMode.Vanish)
}
}
}
}
}
Loading