Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Govorunb committed Jun 17, 2024
1 parent 25196f9 commit 9319ef9
Show file tree
Hide file tree
Showing 29 changed files with 10 additions and 405 deletions.
30 changes: 0 additions & 30 deletions .dockerignore

This file was deleted.

2 changes: 1 addition & 1 deletion SCHIZO/SwarmControl/Captcha.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ public override void Awake()
_data = [.. data];
_data.ForEach(d => d.regex = new Regex(d.textRegex, RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant));
gameObject.SetActive(false);
// i can't get my own blocker working so i'm just gonna yoink this one
CoroutineHost.StartCoroutine(InitCoro());
}

private IEnumerator InitCoro()
{
yield return new WaitUntil(() => uGUI.main && uGUI.main.confirmation && uGUI_FeedbackCollector.main);

// i couldn't get my own input blocker working so i'm just gonna yoink this one
_inputBlocker = uGUI_FeedbackCollector.main.inputBlocker;

Image redBackground = uGUI.main.confirmation.transform.GetChild(0).GetComponent<Image>();
Expand Down
4 changes: 2 additions & 2 deletions SCHIZO/SwarmControl/EggTimer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ public void Start()
{
if (_active) return;
_active = true;
_onStart();
_onStart?.Invoke();
}
public void End()
{
if (!_active) return;
_active = false;
_onEnd();
_onEnd?.Invoke();
}

public void Dispose()
Expand Down
6 changes: 3 additions & 3 deletions SCHIZO/SwarmControl/Redeems/Annoying/HideVehicleSignal.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ namespace SCHIZO.SwarmControl.Redeems.Annoying;
[Redeem(
Name = "redeem_hidecarpings",
DisplayName = "Hide Vehicle Signals",
Description = "Hides vehicle and base signals for 30 seconds."
Description = "Hides vehicle and base signals for 1 minute."
)]
internal class HideVehicleSignal : Command, IParameters
{
public IReadOnlyList<Parameter> Parameters => [];
private EggTimer _timer;
private static float Duration = 30f;
private readonly EggTimer _timer;
private static float Duration = 60f;

public HideVehicleSignal()
{
Expand Down
2 changes: 1 addition & 1 deletion SCHIZO/SwarmControl/Redeems/Audio/NoiseRegistry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ internal static class NoiseRegistry
[NormalNoise.ErmsharkAmbient] = "event:/SCHIZO/creatures/ermshark/ambient",
[NormalNoise.ErmsharkAttack] = "event:/SCHIZO/creatures/ermshark/attack",
[NormalNoise.ErmsharkHurt] = "event:/SCHIZO/creatures/ermshark/hurt",
[NormalNoise.TutelAmbient] = "event:/SCHIZO/creatures/tutel/ambient",
[NormalNoise.TutelAmbient] = "event:/SCHIZO/creatures/tutel/ambient_world",
[NormalNoise.TutelCook] = "event:/SCHIZO/creatures/tutel/cook",
[NormalNoise.TutelEat] = "event:/SCHIZO/creatures/tutel/eat"
};
Expand Down
6 changes: 3 additions & 3 deletions SCHIZO/SwarmControl/Redeems/Enums/AggressiveCreature.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Runtime.Serialization;
//using System.Runtime.Serialization;

namespace SCHIZO.SwarmControl.Redeems.Enums;

Expand All @@ -7,6 +7,6 @@ public enum AggressiveCreature
Ermshark,
Brinewing,
Cryptosuchus,
[EnumMember(Value = "Squid Shark")]
SquidShark,
//[EnumMember(Value = "Squid Shark")]
//SquidShark,
}
6 changes: 0 additions & 6 deletions SwarmControl.Shared/Constants/ConnectionConstants.cs

This file was deleted.

9 changes: 0 additions & 9 deletions SwarmControl.Shared/Models/Game/Command.cs

This file was deleted.

8 changes: 0 additions & 8 deletions SwarmControl.Shared/Models/Game/EnumDefinitionModel.cs

This file was deleted.

12 changes: 0 additions & 12 deletions SwarmControl.Shared/Models/Game/HostAuthInfo.cs

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

38 changes: 0 additions & 38 deletions SwarmControl.Shared/Models/Game/Messages/GameSocketMessage.cs

This file was deleted.

10 changes: 0 additions & 10 deletions SwarmControl.Shared/Models/Game/Messages/HelloBackMessage.cs

This file was deleted.

10 changes: 0 additions & 10 deletions SwarmControl.Shared/Models/Game/Messages/HelloMessage.cs

This file was deleted.

This file was deleted.

9 changes: 0 additions & 9 deletions SwarmControl.Shared/Models/Game/Messages/LogMessage.cs

This file was deleted.

22 changes: 0 additions & 22 deletions SwarmControl.Shared/Models/Game/Messages/MessageType.cs

This file was deleted.

5 changes: 0 additions & 5 deletions SwarmControl.Shared/Models/Game/Messages/PingMessage.cs

This file was deleted.

6 changes: 0 additions & 6 deletions SwarmControl.Shared/Models/Game/Messages/PongMessage.cs

This file was deleted.

17 changes: 0 additions & 17 deletions SwarmControl.Shared/Models/Game/Messages/RedeemMessage.cs

This file was deleted.

12 changes: 0 additions & 12 deletions SwarmControl.Shared/Models/Game/Messages/ResultMessage.cs

This file was deleted.

38 changes: 0 additions & 38 deletions SwarmControl.Shared/Models/Game/Messages/SocketMessage.cs

This file was deleted.

10 changes: 0 additions & 10 deletions SwarmControl.Shared/Models/Game/Messages/TwitchUser.cs

This file was deleted.

18 changes: 0 additions & 18 deletions SwarmControl.Shared/Models/Game/NamedModel.cs

This file was deleted.

Loading

0 comments on commit 9319ef9

Please sign in to comment.