Skip to content

Make smaller subs accelerate faster #14844

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

Make smaller subs accelerate faster #14844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3cd479
Modify drag to allow for better shuttle handling
mygamingaccount Oct 16, 2024
dad9d8e
Backwards compatible engine thrust for new drag formula
mygamingaccount Oct 16, 2024
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
7 changes: 7 additions & 0 deletions Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Engine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Globalization;
using System.Xml.Linq;
using Barotrauma.Networking;
using FarseerPhysics.Dynamics;

namespace Barotrauma.Items.Components
{
Expand Down Expand Up @@ -144,6 +145,12 @@ public override void Update(float deltaTime, Camera cam)
UpdateAITargets(noise);
//arbitrary multiplier that was added to changes in submarine mass without having to readjust all engines
float forceMultiplier = 0.1f;
if (item.Submarine.SubBody.Body != null)
{
float mass = item.Submarine.SubBody.Body.Mass;
float newDragCorrectionFactor = MathF.Pow(mass / SubmarineBody.InertiaReferenceMass, SubmarineBody.MassToAreaExponent) * SubmarineBody.InertiaReferenceMass / mass;
forceMultiplier *= newDragCorrectionFactor;
}
if (User != null)
{
forceMultiplier *= MathHelper.Lerp(0.5f, 2.0f, (float)Math.Sqrt(User.GetSkillLevel(Tags.HelmSkill) / 100));
Expand Down
13 changes: 9 additions & 4 deletions Barotrauma/BarotraumaShared/SharedSource/Map/SubmarineBody.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ public List<Vector2> HullVertices
private float forceUpwardsTimer;
private const float ForceUpwardsDelay = 30.0f;

// submarines greater than "InertialReferenceMass" will accelerate slower, and vica versa. 30000 is about the size of the Humpback.
public const float InertiaReferenceMass = 30000f;
public const float MassToAreaExponent = 2f/3f;

struct Impact
{
public Fixture Target;
Expand Down Expand Up @@ -449,12 +453,13 @@ contactEdge.Other.UserData is Submarine otherSubmarine &&

jointEdge = jointEdge.Next;
}

float surfaceArea = MathF.Pow(Body.Mass / InertiaReferenceMass, MassToAreaExponent) * InertiaReferenceMass;

float horizontalDragCoefficient = MathHelper.Clamp(HorizontalDrag + attachedMass / 5000.0f, 0.0f, MaxDrag);
totalForce.X -= Math.Sign(Body.LinearVelocity.X) * Body.LinearVelocity.X * Body.LinearVelocity.X * horizontalDragCoefficient * Body.Mass;
totalForce.X -= Math.Sign(Body.LinearVelocity.X) * Body.LinearVelocity.X * Body.LinearVelocity.X * horizontalDragCoefficient * surfaceArea;

float verticalDragCoefficient = MathHelper.Clamp(VerticalDrag + attachedMass / 5000.0f, 0.0f, MaxDrag);
totalForce.Y -= Math.Sign(Body.LinearVelocity.Y) * Body.LinearVelocity.Y * Body.LinearVelocity.Y * verticalDragCoefficient * Body.Mass;
totalForce.Y -= Math.Sign(Body.LinearVelocity.Y) * Body.LinearVelocity.Y * Body.LinearVelocity.Y * verticalDragCoefficient * surfaceArea;
}

ApplyForce(totalForce);
Expand Down