Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ defaults:
working-directory: ./EXILED

env:
EXILED_REFERENCES_URL: https://exmod-team.github.io/SL-References/Dev.zip
EXILED_REFERENCES_URL: https://exslmod-team.github.io/SL-References/Dev.zip
EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
EXILED_DLL_ARCHIVER_URL: https://github.com/ExMod-Team/EXILED-DLL-Archiver/releases/latest/download/EXILED-DLL-Archiver.exe
EXILED_DLL_ARCHIVER_URL: https://github.com/ExSLMod-Team/EXILED-DLL-Archiver/releases/latest/download/EXILED-DLL-Archiver.exe

jobs:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:
id-token: write

env:
EXILED_REFERENCES_URL: https://exmod-team.github.io/SL-References/Master.zip
EXILED_REFERENCES_URL: https://exslmod-team.github.io/SL-References/Master.zip
EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/labapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ defaults:
working-directory: ./EXILED

env:
EXILED_REFERENCES_URL: https://exmod-team.github.io/SL-References/LabAPI.zip
EXILED_REFERENCES_URL: https://exslmod-team.github.io/SL-References/LabAPI.zip
EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
EXILED_DLL_ARCHIVER_URL: https://github.com/ExMod-Team/EXILED-DLL-Archiver/releases/download/v1.8.1/EXILED-DLL-Archiver.exe
EXILED_DLL_ARCHIVER_URL: https://github.com/ExSLMod-Team/EXILED-DLL-Archiver/releases/download/v1.8.2/EXILED-DLL-Archiver.exe

jobs:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ defaults:
working-directory: ./EXILED

env:
EXILED_REFERENCES_URL: https://exmod-team.github.io/SL-References/Master.zip
EXILED_REFERENCES_URL: https://exslmod-team.github.io/SL-References/Master.zip
EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push_nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ defaults:
working-directory: ./EXILED

env:
EXILED_REFERENCES_URL: https://ExMod-Team.github.io/SL-References/LabAPI.zip
EXILED_REFERENCES_URL: https://exslmod-team.github.io/SL-References/Dev.zip
EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References

jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ defaults:
working-directory: ./EXILED

env:
EXILED_REFERENCES_URL: https://exmod-team.github.io/SL-References/LabAPI.zip
EXILED_REFERENCES_URL: https://exslmod-team.github.io/SL-References/Dev.zip
EXILED_REFERENCES_PATH: ${{ github.workspace }}/EXILED/References
EXILED_DLL_ARCHIVER_URL: https://github.com/ExMod-Team/EXILED-DLL-Archiver/releases/download/v1.8.1/EXILED-DLL-Archiver.exe
EXILED_DLL_ARCHIVER_URL: https://github.com/ExSLMod-Team/EXILED-DLL-Archiver/releases/latest/download/EXILED-DLL-Archiver.exe

jobs:
build:
Expand Down
6 changes: 3 additions & 3 deletions EXILED/EXILED.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<PropertyGroup>
<!-- This is the global version and is used for all projects that don't have a version -->
<Version Condition="$(Version) == ''">9.6.0-beta8</Version>
<Version Condition="$(Version) == ''">9.6.0</Version>
<!-- Enables public beta warning via the PUBLIC_BETA constant -->
<PublicBeta>false</PublicBeta>

Expand All @@ -25,8 +25,8 @@

<Copyright>Copyright © $(Authors) 2020 - $([System.DateTime]::Now.ToString("yyyy"))</Copyright>
<RepositoryType>Git</RepositoryType>
<RepositoryUrl>https://github.com/ExMod-Team/EXILED</RepositoryUrl>
<PackageProjectUrl>https://github.com/ExMod-Team/EXILED</PackageProjectUrl>
<RepositoryUrl>https://github.com/ExSLMod-Team/EXILED</RepositoryUrl>
<PackageProjectUrl>https://github.com/ExSLMod-Team/EXILED</PackageProjectUrl>
<PackageLicenseExpression>CC-BY-SA-3.0</PackageLicenseExpression>

<DefineConstants Condition="$(PublicBeta) == 'true'">$(DefineConstants);PUBLIC_BETA</DefineConstants>
Expand Down
5 changes: 5 additions & 0 deletions EXILED/Exiled.API/Enums/AdminToyType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,10 @@ public enum AdminToyType
/// Camera Object toy.
/// </summary>
CameraToy,

/// <summary>
/// Text toy.
/// </summary>
TextToy,
}
}
5 changes: 5 additions & 0 deletions EXILED/Exiled.API/Enums/EffectType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -283,5 +283,10 @@ public enum EffectType
/// </summary>
[Obsolete("Only availaible for Christmas and AprilFools.")]
Snowed,

/// <summary>
/// <see cref="CustomPlayerEffects.Scp1344Detected"/>.
/// </summary>
Scp1344Detected,
}
}
3 changes: 3 additions & 0 deletions EXILED/Exiled.API/Enums/PrefabType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -369,5 +369,8 @@ public enum PrefabType

[Prefab(2842703865, "KeycardPickup_Chaos")]
KeycardPickupChaos,

[Prefab(162530276, "TextToy")]
TextToy,
}
}
1 change: 1 addition & 0 deletions EXILED/Exiled.API/Extensions/EffectTypeExtension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ public static class EffectTypeExtension
{ EffectType.SeveredEyes, typeof(SeveredEyes) },
{ EffectType.PitDeath, typeof(PitDeath) },
{ EffectType.Blurred, typeof(Blurred) },
{ EffectType.Scp1344Detected, typeof(Scp1344Detected) },
#pragma warning disable CS0618
{ EffectType.Marshmallow, typeof(MarshmallowEffect) },
{ EffectType.BecomingFlamingo, typeof(BecomingFlamingo) },
Expand Down
38 changes: 2 additions & 36 deletions EXILED/Exiled.API/Features/Roles/Scp049Role.cs
Original file line number Diff line number Diff line change
Expand Up @@ -118,40 +118,6 @@ internal Scp049Role(Scp049GameRole baseRole)
/// </summary>
public IEnumerable<Player> DeadZombies => Scp049ResurrectAbility.DeadZombies.Select(x => Player.Get(x));

// TODO: ReAdd Setter but before making an propper way to overwrite NW constant only when the propperty has been used
#pragma warning disable SA1623 // Property summary documentation should match accessors
#pragma warning disable SA1202
/// <summary>
/// Gets or sets how mush time the Call Ability will be effective.
/// </summary>
internal double CallAbilityDuration { get; } = Scp049CallAbility.EffectDuration;

/// <summary>
/// Gets or sets the Cooldown of the Call Ability.
/// </summary>
internal double CallAbilityBaseCooldown { get; } = Scp049CallAbility.BaseCooldown;

/// <summary>
/// Gets or sets the Cooldown of the Sense Ability.
/// </summary>
internal double SenseAbilityBaseCooldown { get; } = Scp049SenseAbility.BaseCooldown;

/// <summary>
/// Gets or sets the Cooldown of the Sense Ability when you lost your target.
/// </summary>
internal double SenseAbilityReducedCooldown { get; } = Scp049SenseAbility.ReducedCooldown;

/// <summary>
/// Gets or sets the Cooldown of the Sense Ability when it's failed.
/// </summary>
internal double SenseAbilityDuration { get; } = Scp049SenseAbility.EffectDuration;

/// <summary>
/// Gets or sets how mush time the Sense Ability will be effective.
/// </summary>
internal double SenseAbilityFailCooldown { get; } = Scp049SenseAbility.AttemptFailCooldown;
#pragma warning restore SA1623 // Property summary documentation should match accessors

/// <summary>
/// Gets all the resurrected players.
/// </summary>
Expand Down Expand Up @@ -319,7 +285,7 @@ public void Sense(Player player)

if (SenseAbility.Target is null)
{
SenseAbility.Cooldown.Trigger(SenseAbilityFailCooldown);
SenseAbility.Cooldown.Trigger(Scp049SenseAbility.AttemptFailCooldown);
SenseAbility.ServerSendRpc(true);
return;
}
Expand All @@ -332,7 +298,7 @@ public void Sense(Player player)
if (!VisionInformation.GetVisionInformation(SenseAbility.Owner, SenseAbility.Owner.PlayerCameraReference, humanRole.CameraPosition, radius, SenseAbility._distanceThreshold).IsLooking)
return;

SenseAbility.Duration.Trigger(SenseAbilityDuration);
SenseAbility.Duration.Trigger(Scp049SenseAbility.EffectDuration);
SenseAbility.HasTarget = true;
SenseAbility.ServerSendRpc(true);
}
Expand Down
1 change: 1 addition & 0 deletions EXILED/Exiled.API/Features/Toys/AdminToy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ public static AdminToy Get(AdminToyBase adminToyBase)
CapybaraToy capybaraToy => new Capybara(capybaraToy),
Scp079CameraToy scp079CameraToy => new CameraToy(scp079CameraToy),
InvisibleInteractableToy invisibleInteractableToy => new InteractableToy(invisibleInteractableToy),
TextToy textToy => new Text(textToy),
_ => throw new System.NotImplementedException()
};
}
Expand Down
55 changes: 55 additions & 0 deletions EXILED/Exiled.API/Features/Toys/Text.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
// -----------------------------------------------------------------------
// <copyright file="Text.cs" company="ExMod Team">
// Copyright (c) ExMod Team. All rights reserved.
// Licensed under the CC BY-SA 3.0 license.
// </copyright>
// -----------------------------------------------------------------------

namespace Exiled.API.Features.Toys
{
using AdminToys;
using Enums;
using Exiled.API.Interfaces;
using UnityEngine;

/// <summary>
/// A wrapper class for <see cref="TextToy"/>.
/// </summary>
public class Text : AdminToy, IWrapper<TextToy>
{
/// <summary>
/// Initializes a new instance of the <see cref="Text"/> class.
/// </summary>
/// <param name="speakerToy">The <see cref="TextToy"/> of the toy.</param>
internal Text(TextToy speakerToy)
: base(speakerToy, AdminToyType.TextToy) => Base = speakerToy;

/// <summary>
/// Gets the prefab.
/// </summary>
public static TextToy Prefab => PrefabHelper.GetPrefab<TextToy>(PrefabType.TextToy);

/// <summary>
/// Gets the base <see cref="TextToy"/>.
/// </summary>
public TextToy Base { get; }

/// <summary>
/// Gets or sets the Text shown.
/// </summary>
public string TextFormat
{
get => Base.Network_textFormat;
set => Base.Network_textFormat = value;
}

/// <summary>
/// Gets or sets the size of the Display Size of the Text.
/// </summary>
public Vector2 DisplaySize
{
get => Base.Network_displaySize;
set => Base.Network_displaySize = value;
}
}
}
2 changes: 1 addition & 1 deletion EXILED/Exiled.CreditTags/Features/DatabaseHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace Exiled.CreditTags.Features

public static class DatabaseHandler
{
private const string Url = "https://raw.githubusercontent.com/ExMod-Team/CreditTags/main/data.yml";
private const string Url = "https://raw.githubusercontent.com/ExSLMod-Team/CreditTags/main/data.yml";
private const string ETagCacheFileName = "etag_cache.txt";
private const string DatabaseCacheFileName = "data.yml";
private const int CacheTimeInMinutes = 5;
Expand Down
51 changes: 0 additions & 51 deletions EXILED/Exiled.Events/Commands/Hub/Hub.cs

This file was deleted.

64 changes: 0 additions & 64 deletions EXILED/Exiled.Events/Commands/Hub/HubApi/ApiProvider.cs

This file was deleted.

Loading