Skip to content

Add airburst distance offset #4199

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
wants to merge 1 commit into
base: Development
Choose a base branch
from
Open

Add airburst distance offset #4199

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
4 changes: 3 additions & 1 deletion Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE_Bursting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,19 @@ public override void ExposeData()
public override void Launch(Thing launcher, Vector2 origin, float shotAngle, float shotRotation, float shotHeight = 0f, float shotSpeed = -1f, Thing equipment = null, float distance = -1)
{
int armingDelay = 0;
float airburstDistanceOffset = 0f;
if (def.projectile is ProjectilePropertiesCE props)
{
armingDelay = props.armingDelay;
this.castShadow = props.castShadow;
this.GravityPerWidth = props.GravityPerWidth;
airburstDistanceOffset = props.airburstDistanceOffset;
}
if (distance > 0)
{
float cosine = (float)Math.Cos((double)shotAngle);

float fuzeTiming = distance / ((shotSpeed / 60) * cosine);
float fuzeTiming = (distance + airburstDistanceOffset) / ((shotSpeed / 60) * cosine);
#if DEBUG
Log.Message("Distance = " + distance);
Log.Message("ShotSpeed = " + shotSpeed / 60);
Expand Down
1 change: 1 addition & 0 deletions Source/CombatExtended/CombatExtended/Projectiles/ProjectilePropertiesCE.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public class ProjectilePropertiesCE : ProjectileProperties

public int armingDelay = 0;
public float aimHeightOffset = 0;
public float airburstDistanceOffset = 0f;

public float empShieldBreakChance = 1f;
public float collideDistance = 1f;
Expand Down