Skip to content

Commit

Permalink
Code cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
@Bod9001
Bod9001 committed Mar 16, 2024
1 parent 1b5c002 commit 6d8ef9d
Show file tree
Hide file tree
Showing 28 changed files with 232 additions and 714 deletions.
66 changes: 0 additions & 66 deletions UnityProject/Assets/IngameDebugConsole/Scripts/DebugLogUnitystationCommands.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,72 +399,6 @@ private static void RespawnLocalPlayer()
}
}

private static HashSet<MatrixInfo> usedMatrices = new HashSet<MatrixInfo>();
private static Tuple<MatrixInfo, Vector3> lastUsedMatrix;
#if UNITY_EDITOR
[MenuItem("Networking/Crash random matrix into station")]
#endif
private static void CrashIntoStation()
{
if (CustomNetworkManager.Instance._isServer)
{
StopLastCrashed();

Vector2 appearPos = new Vector2Int(-50, 37);
var usedMatricesCount = usedMatrices.Count;

var matrices = MatrixManager.Instance.MovableMatrices;
//limit to shuttles if you wish
// .Where( matrix => matrix.GameObject.name.ToLower().Contains( "shuttle" )
// || matrix.GameObject.name.ToLower().Contains( "pod" ) );

foreach ( var movableMatrix in matrices )
{
if ( movableMatrix.GameObject.name.ToLower().Contains( "verylarge" ) )
{
continue;
}

if ( usedMatrices.Contains( movableMatrix ) )
{
continue;
}

usedMatrices.Add( movableMatrix );
//lastUsedMatrix = new Tuple<MatrixInfo, Vector3>(movableMatrix, movableMatrix.MatrixMove.ServerState.Position);
var mm = movableMatrix.MatrixMove;
// mm.SetPosition( appearPos );
// mm.RequiresFuel = false;
// mm.SafetyProtocolsOn = false;
// mm.SteerTo( Orientation.Right );
// mm.SetSpeed( 15 );
// mm.StartMovement();

break;
}

if ( usedMatricesCount == usedMatrices.Count && usedMatricesCount > 0 )
{ //ran out of unused matrices - doing it again
usedMatrices.Clear();
CrashIntoStation();
}
}
}
#if UNITY_EDITOR
[MenuItem("Networking/Stop last crashed matrix")]
#endif
private static void StopLastCrashed()
{
if (CustomNetworkManager.Instance._isServer)
{
if ( lastUsedMatrix != null )
{
// lastUsedMatrix.Item1.MatrixMove.StopMovement();
// lastUsedMatrix.Item1.MatrixMove.SetPosition( lastUsedMatrix.Item2 );
lastUsedMatrix = null;
}
}
}
#if UNITY_EDITOR
[MenuItem("Networking/Make players EVA-ready")]
#endif
Expand Down
2 changes: 0 additions & 2 deletions UnityProject/Assets/Scripts/Core/Camera/Camera2DFollow.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,6 @@ private void UpdateMe()
_camera.worldToCameraMatrix = offsetMatrix * _camera.transform.worldToLocalMatrix;


//starsBackground.position = newPos;

if (stencilMask != null && stencilMask.transform.parent != target)
{
stencilMask.transform.parent = target;
Expand Down
9 changes: 0 additions & 9 deletions UnityProject/Assets/Scripts/Managers/CentComm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,6 @@ private IEnumerator WaitToPrepareReport()

yield return WaitFor.Seconds(60f);

//Gather asteroid locations:
foreach (var body in gameManager.SpaceBodies)
{
if (body.TryGetComponent<Asteroid>(out _))
{
//asteroidLocations.Add(body.ServerState.Position);
}
}

//Add in random positions
int randomPosCount = Random.Range(1, 5);
for (int i = 0; i <= randomPosCount; i++)
Expand Down
34 changes: 1 addition & 33 deletions UnityProject/Assets/Scripts/Managers/GameManager.Escape.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,6 @@ private void InitEscapeStuff()
if (primaryEscapeShuttle.MatrixInfo == null) return;
if (primaryEscapeShuttle.MatrixInfo.IsMovable == false) return;
}
//
// var orientation = primaryEscapeShuttle.MatrixInfo.MatrixMove.InitialFacing;
// float width;
//
// if (orientation == Orientation.Up || orientation == Orientation.Down)
// {
// width = PrimaryEscapeShuttle.MatrixInfo.LocalBounds.size.x;
// }
// else
// {
// width = PrimaryEscapeShuttle.MatrixInfo.LocalBounds.size.y;
// }

Vector3 newPos;

Expand All @@ -93,26 +81,6 @@ private void InitEscapeStuff()
return;
}

// switch (LandingZoneManager.Instance.centcomDocking.orientation)
// {
// case OrientationEnum.Right_By270:
// newPos = new Vector3(LandingZoneManager.Instance.centcomDockingPos.x + Mathf.Ceil(width/2f),LandingZoneManager.Instance.centcomDockingPos.y, 0);
// break;
// case OrientationEnum.Up_By0:
// newPos = new Vector3(LandingZoneManager.Instance.centcomDockingPos.x ,LandingZoneManager.Instance.centcomDockingPos.y + Mathf.Ceil(width/2f), 0);
// break;
// case OrientationEnum.Left_By90:
// newPos = new Vector3(LandingZoneManager.Instance.centcomDockingPos.x - Mathf.Ceil(width/2f),LandingZoneManager.Instance.centcomDockingPos.y, 0);
// break;
// default:
// newPos = new Vector3(LandingZoneManager.Instance.centcomDockingPos.x ,LandingZoneManager.Instance.centcomDockingPos.y - Mathf.Ceil(width/2f), 0);
// break;
// }

// PrimaryEscapeShuttle.MatrixInfo.MatrixMove.ChangeFacingDirection(Orientation.FromEnum(PrimaryEscapeShuttle.orientationForDockingAtCentcom));
// PrimaryEscapeShuttle.MatrixInfo.MatrixMove.SetPosition(newPos);
//primaryEscapeShuttle.InitDestination(newPos);

beenToStation = false;
}

Expand Down Expand Up @@ -193,7 +161,7 @@ private IEnumerator SendEscapeShuttle(int seconds)
yield return WaitFor.Seconds(1);
}

Loggy.LogError("OH SHITTTT Shuttle got stuck on the Way to Centralcommand AAAAAAAAAAAAAAAAAAAAAAAAAAAA emergency end round");
Loggy.LogError("[GameManager.Escape/SendEscapeShuttle()] - OH SHITTTT Shuttle got stuck on the Way to Centralcommand AAAAAAAAAAAAAAAAAAAAAAAAAAAA emergency end round");
EndRound();
}

Expand Down
13 changes: 6 additions & 7 deletions UnityProject/Assets/Scripts/Managers/MatrixManager/CentralCommandBeacon.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ public class CentralCommandBeacon : MonoBehaviour
{
public GuidanceBuoy CentCommGuidanceBuoy;
private CentComm CentComm;
void Start()
{
CentComm = GameManager.Instance.GetComponent<CentComm>();
CentComm.CentCommGuidanceBuoy = CentCommGuidanceBuoy;
}


}
void Start()
{
CentComm = GameManager.Instance.GetComponent<CentComm>();
CentComm.CentCommGuidanceBuoy = CentCommGuidanceBuoy;
}
}
128 changes: 50 additions & 78 deletions UnityProject/Assets/Scripts/Managers/MatrixManager/MatrixManager.Collisions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ private void InitCollisions(MatrixInfo matrixInfo)
if ( movingMatrices.Contains( matrixInfo ) )
{
var participatingIntersections = trackedIntersections.FindAll( intersection => intersection.Matrix1 == matrixInfo );
//matrixInfo.MatrixMove.MatrixMoveEvents.OnFullStopClient.AddListener( CollideBeforeStop( matrixInfo, participatingIntersections ) );
//TODO!!!
matrixInfo.MatrixMove.NetworkedMatrixMove.OnStopMovement.AddListener( CollideBeforeStop( matrixInfo, participatingIntersections ) );
movingMatrices.Remove( matrixInfo );
trackedIntersections.RemoveAll( intersection => intersection.Matrix1 == matrixInfo );
}
Expand Down Expand Up @@ -214,8 +214,53 @@ private void UpdateMe()
}
}

private static void MatrixSafetyCheck(MatrixInfo Matrix1)
{
if (Matrix1.MatrixMove.NetworkedMatrixMove.Safety)
{

if (Matrix1.MatrixMove.NetworkedMatrixMove.TargetOrientation != OrientationEnum.Default)
{
var StartOrientation = Matrix1.MatrixMove.NetworkedMatrixMove.StartOrientation;
Matrix1.MatrixMove.NetworkedMatrixMove.TargetOrientation = Matrix1.MatrixMove.NetworkedMatrixMove.StartOrientation;
Matrix1.MatrixMove.NetworkedMatrixMove.StartOrientation = StartOrientation;
}


var addmove = Matrix1.MatrixMove.NetworkedMatrixMove.WorldCurrentVelocity.normalized * -1;
Matrix1.MatrixMove.NetworkedMatrixMove.TargetTransform.position += addmove;

Matrix1.MatrixMove.NetworkedMatrixMove.WorldCurrentVelocity *= 0;
Matrix1.MatrixMove.NetworkedMatrixMove.MoveCoolDown = 3;


foreach (var Thruster in Matrix1.MatrixMove.NetworkedMatrixMove.ConnectedThrusters)
{
Thruster.TargetMolesUsed = 0;
}
return;

Check notice on line 241 in UnityProject/Assets/Scripts/Managers/MatrixManager/MatrixManager.Collisions.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

UnityProject/Assets/Scripts/Managers/MatrixManager/MatrixManager.Collisions.cs#L241 

Remove this redundant jump.
}
}


private static void MatrixSpeedCheck(MatrixInfo Matrix1, MatrixInfo Matrix2)
{
if (Matrix2.MatrixMove.NetworkedMatrixMove.WorldCurrentVelocity.magnitude < 4
&& Matrix1.MatrixMove.NetworkedMatrixMove.WorldCurrentVelocity.magnitude < 4)
{
if (Matrix1.MatrixMove.NetworkedMatrixMove.DragSpinneyCoolDown > 0 == false &&
Matrix2.MatrixMove.NetworkedMatrixMove.DragSpinneyCoolDown > 0 == false)
{
Matrix2.MatrixMove.NetworkedMatrixMove.WorldCurrentVelocity *= -1;
Matrix1.MatrixMove.NetworkedMatrixMove.WorldCurrentVelocity *= -1;
}
}

}

private static List<Vector3Int> collisionLocations = new List<Vector3Int>();


private void CheckTileCollisions( MatrixIntersection i )
{
if (i.Matrix1 == null || i.Matrix2 == null) return;
Expand Down Expand Up @@ -252,74 +297,16 @@ private void CheckTileCollisions( MatrixIntersection i )
}


if (i.Matrix1.MatrixMove.NetworkedMatrixMove.Safety)
{


if (i.Matrix1.MatrixMove.NetworkedMatrixMove.TargetOrientation != OrientationEnum.Default)
{
var StartOrientation =i.Matrix1.MatrixMove.NetworkedMatrixMove.StartOrientation;
i.Matrix1.MatrixMove.NetworkedMatrixMove.TargetOrientation = i.Matrix1.MatrixMove.NetworkedMatrixMove.StartOrientation;
i.Matrix1.MatrixMove.NetworkedMatrixMove.StartOrientation = StartOrientation;
}


var addmove = i.Matrix1.MatrixMove.NetworkedMatrixMove.WorldCurrentVelocity.normalized * -1;
i.Matrix1.MatrixMove.NetworkedMatrixMove.TargetTransform.position += addmove;

i.Matrix1.MatrixMove.NetworkedMatrixMove.WorldCurrentVelocity *= 0;
i.Matrix1.MatrixMove.NetworkedMatrixMove.MoveCoolDown = 3;


foreach (var Thruster in i.Matrix1.MatrixMove.NetworkedMatrixMove.ConnectedThrusters)
{
Thruster.TargetMolesUsed = 0;
}
return;
}

if (i.Matrix2.MatrixMove.NetworkedMatrixMove.Safety)
{
if (i.Matrix2.MatrixMove.NetworkedMatrixMove.TargetOrientation != OrientationEnum.Default)
{
var StartOrientation = i.Matrix2.MatrixMove.NetworkedMatrixMove.StartOrientation;
i.Matrix2.MatrixMove.NetworkedMatrixMove.TargetOrientation =
i.Matrix2.MatrixMove.NetworkedMatrixMove.StartOrientation;
i.Matrix2.MatrixMove.NetworkedMatrixMove.StartOrientation = StartOrientation;
}

var addmove = i.Matrix2.MatrixMove.NetworkedMatrixMove.WorldCurrentVelocity.normalized * -1;
i.Matrix2.MatrixMove.NetworkedMatrixMove.TargetTransform.position += addmove;
MatrixSafetyCheck(i.Matrix1);

i.Matrix2.MatrixMove.NetworkedMatrixMove.WorldCurrentVelocity *= 0;
i.Matrix2.MatrixMove.NetworkedMatrixMove.MoveCoolDown = 3;
foreach (var Thruster in i.Matrix2.MatrixMove.NetworkedMatrixMove.ConnectedThrusters)
{
Thruster.TargetMolesUsed = 0;
}
MatrixSafetyCheck(i.Matrix2);


return;
}


if (i.Matrix2.MatrixMove.NetworkedMatrixMove.WorldCurrentVelocity.magnitude < 4
&& i.Matrix1.MatrixMove.NetworkedMatrixMove.WorldCurrentVelocity.magnitude < 4)
{
if (i.Matrix1.MatrixMove.NetworkedMatrixMove.DragSpinneyCoolDown > 0 == false &&
i.Matrix2.MatrixMove.NetworkedMatrixMove.DragSpinneyCoolDown > 0 == false)
{
i.Matrix2.MatrixMove.NetworkedMatrixMove.WorldCurrentVelocity *= -1;
i.Matrix1.MatrixMove.NetworkedMatrixMove.WorldCurrentVelocity *= -1;
}
}
MatrixSpeedCheck(i.Matrix1, i.Matrix2);

i.Matrix2.MatrixMove.NetworkedMatrixMove.DragSpinneyCoolDown = 3;
i.Matrix1.MatrixMove.NetworkedMatrixMove.DragSpinneyCoolDown = 3;
collisionLocations.Add( worldPos );



//
// ******** DESTROY STUFF!!! ********
//
Expand Down Expand Up @@ -376,21 +363,6 @@ private void CheckTileCollisions( MatrixIntersection i )
ApplyWireDamage( i.Matrix1, cellPos1 );
ApplyWireDamage( i.Matrix2, cellPos2 );

//Heat shit up
//i.Matrix1.ReactionManager.ExposeHotspot( cellPos1, 500);
//i.Matrix2.ReactionManager.ExposeHotspot( cellPos2, 500);

//Other
foreach ( var layer in layersToRemove )
{
//i.Matrix1.TileChangeManager.MetaTileMap.RemoveTileWithlayer( cellPos1, layer );
//i.Matrix2.TileChangeManager.MetaTileMap.RemoveTileWithlayer( cellPos2, layer );
}
foreach ( var layer in effectsToRemove )
{
//i.Matrix1.TileChangeManager.MetaTileMap.RemoveAllOverlays( cellPos1, layer ); //TODO laggy?
//i.Matrix2.TileChangeManager.MetaTileMap.RemoveAllOverlays( cellPos2, layer );
}
}

if ( collisions > 0 )
Expand Down

0 comments on commit 6d8ef9d

Please sign in to comment.