Skip to content
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.

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

[EXILED9] #2635

Merged
merged 3 commits into from
Jun 23, 2024
Merged
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
98 changes: 49 additions & 49 deletions EXILED.props
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup Condition="$(BaseProperties) == '' OR $(BaseProperties) == 'true'">
<Authors>Exiled Team</Authors>
</PropertyGroup>

<PropertyGroup Condition="$(BuildProperties) == '' OR $(BuildProperties) == 'true'">
<TargetFramework>net48</TargetFramework>
<LangVersion>9.0</LangVersion>
<PlatformTarget>x64</PlatformTarget>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>$(MSBuildThisFileDirectory)\bin\$(Configuration)\</OutputPath>
</PropertyGroup>

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

<HarmonyVersion>2.2.2</HarmonyVersion>
<StyleCopVersion>1.1.118</StyleCopVersion>
<SemanticVersioningVersion>2.0.2</SemanticVersioningVersion>
<YamlDotNetVersion>13.7.1</YamlDotNetVersion>

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

<DefineConstants Condition="$(PublicBeta) == 'true'">$(DefineConstants);PUBLIC_BETA</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)' == 'Release'">
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<DebugType>Portable</DebugType>
</PropertyGroup>

<!-- Disable warning about disabled generation of xml files on debug build -->
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<NoWarn>$(NoWarn);SA0001</NoWarn>
</PropertyGroup>

<PropertyGroup>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
</PropertyGroup>

</Project>
<PropertyGroup Condition="$(BaseProperties) == '' OR $(BaseProperties) == 'true'">
<Authors>Exiled Team</Authors>
</PropertyGroup>

<PropertyGroup Condition="$(BuildProperties) == '' OR $(BuildProperties) == 'true'">
<TargetFramework>net48</TargetFramework>
<LangVersion>9.0</LangVersion>
<PlatformTarget>x64</PlatformTarget>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>$(MSBuildThisFileDirectory)\bin\$(Configuration)\</OutputPath>
</PropertyGroup>

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

<HarmonyVersion>2.2.2</HarmonyVersion>
<StyleCopVersion>1.1.118</StyleCopVersion>
<SemanticVersioningVersion>2.0.2</SemanticVersioningVersion>
<YamlDotNetVersion>13.7.1</YamlDotNetVersion>

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

<DefineConstants Condition="$(PublicBeta) == 'true'">$(DefineConstants);PUBLIC_BETA</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)' == 'Release'">
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<DebugType>Portable</DebugType>
</PropertyGroup>

<!-- Disable warning about disabled generation of xml files on debug build -->
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<NoWarn>$(NoWarn);SA0001</NoWarn>
</PropertyGroup>

<PropertyGroup>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
</PropertyGroup>
louis1706 marked this conversation as resolved.
Show resolved Hide resolved

</Project>
27 changes: 18 additions & 9 deletions Exiled.API/Enums/DangerType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
namespace Exiled.API.Enums
{
using CustomPlayerEffects.Danger;
using Exiled.API.Features.Roles;

/// <summary>
/// A list of Types used by exiled for <see cref="DangerStackBase"/>.
Expand All @@ -20,43 +21,51 @@ public enum DangerType
None = -1,

/// <summary>
/// Warhead.
/// Warhead has been activated but not detonated.
/// </summary>
/// <remarks>Used for <see cref="WarheadDanger"/>.</remarks>
Warhead,

/// <summary>
/// Cardiac Arrest.
/// Has <see cref="EffectType.CardiacArrest"/>.
/// </summary>
/// <remarks>Used for <see cref="CardiacArrestDanger"/>.</remarks>
CardiacArrest,

/// <summary>
/// Rage Target.
/// <see cref="Scp096Role"/> rage target.
/// </summary>
/// <remarks>Used for <see cref="RageTargetDanger"/>.</remarks>
RageTarget,

/// <summary>
/// Corroding.
/// Has <see cref="EffectType.Corroding"/>.
/// </summary>
/// <remarks>Used for <see cref="CorrodingDanger"/>.</remarks>
Corroding,

/// <summary>
/// Player Damaged.
/// Has taken damage.
/// </summary>
/// <remarks>Used for <see cref="PlayerDamagedDanger"/>.</remarks>
PlayerDamaged,

/// <summary>
/// Scp Encounter.
/// Encountered an SCP
/// </summary>
/// <remarks>Used for <see cref="ScpEncounterDanger"/>.</remarks>
ScpEncounter,

/// <summary>
/// Zombie Encounter.
/// Encountered <see cref="Scp0492Role"/>.
/// </summary>
/// <remarks>Used for <see cref="ZombieEncounterDanger"/>.</remarks>
ZombieEncounter,

/// <summary>
/// Armed Enemy.
/// Encountered an armed enemy.
/// </summary>
ArmedEnemy,
/// <remarks>Used for <see cref="ArmedEnemyDanger"/>.</remarks>
ArmedEnemyEncounter,
}
}
12 changes: 6 additions & 6 deletions Exiled.API/Enums/DecontaminationPhase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,32 +21,32 @@ public enum DecontaminationPhase
Start,

/// <summary>
/// It's remain 10 minutes.
/// It's 10 minutes remaining.
/// </summary>
Remain10Minutes,

/// <summary>
/// It's remain 5 minutes.
/// It's 5 minutes remaining.
/// </summary>
Remain5Minutes,

/// <summary>
/// It's remain 1 minutes.
/// It's 1 minute remaining.
/// </summary>
Remain1Minute,

/// <summary>
/// It's remain 30 seconds.
/// It's 30 seconds remaining.
/// </summary>
Countdown,

/// <summary>
/// All doors is closed lock.
/// All doors are closed and lock.
/// </summary>
Lockdown,

/// <summary>
/// The decontamination has been done.
/// The decontamination has finished.
/// </summary>
Finish,
}
Expand Down
18 changes: 9 additions & 9 deletions Exiled.API/Extensions/DangerTypeExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
// -----------------------------------------------------------------------
// <copyright file="DangerTypeExtensions.cs" company="Exiled Team">
// Copyright (c) Exiled Team. All rights reserved.
// Licensed under the CC BY-SA 3.0 license.
// </copyright>
// -----------------------------------------------------------------------
// <copyright file="DangerTypeExtensions.cs" company="Exiled Team">
// Copyright (c) Exiled Team. All rights reserved.
// Licensed under the CC BY-SA 3.0 license.
// </copyright>
// -----------------------------------------------------------------------

namespace Exiled.API.Extensions
{
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Linq;

using CustomPlayerEffects.Danger;
using Exiled.API.Enums;

/// <summary>
/// A set of extensions for <see cref="DangerType"/>.
/// </summary>
/// </summary>
public static class DangerTypeExtensions
{
/// <summary>
Expand All @@ -32,7 +32,7 @@ public static class DangerTypeExtensions
{ DangerType.PlayerDamaged, typeof(PlayerDamagedDanger) },
{ DangerType.ScpEncounter, typeof(ScpEncounterDanger) },
{ DangerType.ZombieEncounter, typeof(ZombieEncounterDanger) },
{ DangerType.ArmedEnemy, typeof(ArmedEnemyDanger) },
{ DangerType.ArmedEnemyEncounter, typeof(ArmedEnemyDanger) },
});

/// <summary>
Expand Down
4 changes: 0 additions & 4 deletions Exiled.CustomModules/CustomModules.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ public override void OnEnabled()
StaticActor.CreateNewInstance<PickupTracker>();
}

SubscribeEvents();

base.OnEnabled();
}

Expand All @@ -114,8 +112,6 @@ public override void OnDisabled()
CustomEscape.DisableAll();
CustomGameMode.DisableAll();

UnsubscribeEvents();

base.OnDisabled();
}

Expand Down
2 changes: 2 additions & 0 deletions Exiled.Loader/Loader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ public Loader()
public static void LoadPlugins()
{
File.Delete(Path.Combine(Paths.Plugins, "Exiled.Updater.dll"));
File.Delete(Path.Combine(Paths.Plugins, "Exiled.CustomRoles.dll"));
File.Delete(Path.Combine(Paths.Plugins, "Exiled.CustomItems.dll"));

foreach (string assemblyPath in Directory.GetFiles(Paths.Plugins, "*.dll"))
{
Expand Down
Loading