Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[Fixes] Всякое (#265)

Browse Source 
* syndicate teleporter fixes

* trigger fix
This commit is contained in:
CaypenNow
2024-04-02 19:19:23 +05:00
committed by GitHub
parent ade61ac06d
commit fa00c5f528
4 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/_White/ExperimentalSyndicateTeleporter/ExperimentalSyndicateTeleporter.cs
View File

@@ -47,16 +47,15 @@ public sealed class ExperimentalSyndicateTeleporter : EntitySystem
if (component.Uses >= 4)
continue;
component.ChargeCooldown += _timing.FrameTime;
component.ChargeCooldown += frameTime;
if (component.ChargeCooldown <= component.NextRechargeAttempt)
if (component.ChargeCooldown <= component.NextRechargeAttempt.TotalSeconds)
continue;
if (_random.Next(0, 10) != 0)
{
component.ChargeCooldown = TimeSpan.Zero;
component.ChargeCooldown = 0F;
if (!_random.Prob(0.1F))
continue;
}
component.Uses++;
}
@@ -102,7 +101,7 @@ public sealed class ExperimentalSyndicateTeleporter : EntitySystem
if (TryCheckWall(coords))
{
EmergencyTeleportation(args.User, xform, component, oldCoords);
EmergencyTeleportation(args.User, xform, component, oldCoords, newOffset);
return;
}
@@ -119,9 +118,8 @@ public sealed class ExperimentalSyndicateTeleporter : EntitySystem
args.PushMarkup(Loc.GetString("experimental-syndicate-teleporter-examine", ("uses", component.Uses)));
}
private void EmergencyTeleportation(EntityUid uid, TransformComponent xform, ExperimentalSyndicateTeleporterComponent component, EntityCoordinates oldCoords)
private void EmergencyTeleportation(EntityUid uid, TransformComponent xform, ExperimentalSyndicateTeleporterComponent component, EntityCoordinates oldCoords, Vector2 offset)
{
var offset = xform.LocalRotation.ToWorldVec().Normalized();
var newOffset = offset + VectorRandomDirection(component, offset, component.EmergencyLength);
var coords = xform.Coordinates.Offset(newOffset).SnapToGrid(EntityManager);

4
Content.Server/_White/ExperimentalSyndicateTeleporter/ExperimentalSyndicateTeleporterComponent.cs
View File

@@ -17,7 +17,7 @@ public sealed partial class ExperimentalSyndicateTeleporterComponent : Component
public int MaxTeleportRange = 8;
[ViewVariables(VVAccess.ReadWrite)]
public int EmergencyLength = 3;
public int EmergencyLength = 4;
[ViewVariables(VVAccess.ReadWrite)]
public List<int> RandomRotations = new() {90, -90};
@@ -41,5 +41,5 @@ public sealed partial class ExperimentalSyndicateTeleporterComponent : Component
public TimeSpan NextRechargeAttempt = TimeSpan.FromSeconds(1);
[ViewVariables(VVAccess.ReadOnly)]
public TimeSpan ChargeCooldown = TimeSpan.Zero;
public float ChargeCooldown = 0F;
}