Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
6d6f2d2
added more features for lobby and vote
RisottoMan Oct 14, 2023
57617b1
Rename Invisible to IHidden.
Redforce04 Oct 14, 2023
3a3490c
Merge pull request #44 from Redforce04/local_dev
Redforce04 Oct 17, 2023
45a4ae8
rename invisible to IHidden
RisottoMan Oct 18, 2023
1a78cc6
cleaning up new features
RisottoMan Oct 18, 2023
a0e5761
Merge branch 'dev' into dev_1
RisottoMan Oct 18, 2023
1575e46
Merge pull request #45 from KoT0XleB/dev_1
RisottoMan Oct 18, 2023
7b7fc40
comment kot0xleb features
RisottoMan Oct 18, 2023
ffc9d0e
Spleef stuff
Redforce04 Oct 21, 2023
fa97b15
Merge pull request #47 from Redforce04/local_dev
Redforce04 Oct 22, 2023
6a6b332
Merge pull request #5 from Redforce04/local_dev
Redforce04 Oct 22, 2023
7f82acf
Merge pull request #48 from Redforce04/local_dev
Redforce04 Oct 22, 2023
72a0ec0
allow unsafe code :)
Redforce04 Oct 22, 2023
4e427ad
more fixes and shit
Redforce04 Oct 22, 2023
88bc47d
Merge pull request #50 from Redforce04/local_dev
Redforce04 Oct 22, 2023
e629156
Fix IHidden
Redforce04 Oct 22, 2023
1157f38
Merge pull request #49 from KoT0XleB/dev
RisottoMan Oct 22, 2023
c90ba7f
new halloween minigame
RisottoMan Oct 23, 2023
82e8564
Halloween Update yay
Redforce04 Oct 24, 2023
5905297
Merge remote-tracking branch 'origin/BuildSystemRevamp' into local_dev
Redforce04 Oct 25, 2023
ed6b341
Add FeatureList
Redforce04 Oct 25, 2023
9e31ad9
Build Revamp P2. Add Command for Build Info
Redforce04 Oct 26, 2023
11d1254
Merge branch 'local_dev' into Feature_New_Games
Redforce04 Oct 26, 2023
2c794c7
Update ActiveFeatures.cs
Redforce04 Oct 26, 2023
38bdca8
Merge branch 'local_dev' into Feature_New_Games
Redforce04 Oct 26, 2023
26994af
Fix this
Redforce04 Oct 26, 2023
d6cab87
Update Fix
Redforce04 Oct 26, 2023
7910bdf
Add gitignore VersionInfo
Redforce04 Oct 26, 2023
ab90dce
Ignore
Redforce04 Oct 26, 2023
101e8cd
Merge branch 'local_dev' into Feature_New_Games
Redforce04 Oct 26, 2023
e00cb3e
Fix Unsafe Code
Redforce04 Oct 26, 2023
c98753f
Merge branch 'local_dev' into Feature_New_Games
Redforce04 Oct 26, 2023
de8f8cf
Unsafe Code V2
Redforce04 Oct 26, 2023
fc3fe75
Unsafe code just keeps reverting to false? IDK why
Redforce04 Oct 26, 2023
672144f
Merge branch 'local_dev' into Feature_New_Games
Redforce04 Oct 26, 2023
181cdd6
Work on Destructible Primitives
Redforce04 Oct 27, 2023
0af6dae
Merge branch 'local_dev' into HalloweenBeta
Redforce04 Oct 27, 2023
4a61f1e
stupid NW Update
Redforce04 Oct 27, 2023
baf935b
Update Deps
Redforce04 Oct 27, 2023
b09c00c
Update Build Info Version Location
Redforce04 Oct 27, 2023
970d631
Merge branch 'local_dev' into HalloweenBeta
Redforce04 Oct 27, 2023
008295b
fix buildinfo command
Redforce04 Oct 27, 2023
b8072e1
Merge branch 'local_dev' into HalloweenBeta
Redforce04 Oct 27, 2023
c8673b1
Merge branch 'local_dev' into Feature_New_Games
Redforce04 Oct 27, 2023
6949068
spleef mostly works?
Redforce04 Oct 27, 2023
ec005ee
Commit
Redforce04 Oct 27, 2023
6484d97
Initial Inventory Menu System Implementation
Redforce04 Oct 28, 2023
b4df7db
Menu Changes
Redforce04 Oct 28, 2023
30b5bc5
current ghostbusters
Redforce04 Oct 28, 2023
7b09a1e
Add end conditions
Redforce04 Oct 28, 2023
56cd82f
more
Redforce04 Oct 28, 2023
124de4e
Auto Restart
Redforce04 Oct 28, 2023
d33cf84
NoRestart
Redforce04 Oct 28, 2023
5aefb2f
Merge branch 'local_dev' into Feature_New_Games
Redforce04 Oct 28, 2023
364091d
Merge branch 'local_dev' into Feature_Inventory_Menu_System
Redforce04 Oct 28, 2023
a6c74c2
Merge branch 'local_dev' into HalloweenBeta
Redforce04 Oct 28, 2023
c9c68ec
Merge remote-tracking branch 'origin/Feature_Inventory_Menu_System' i…
Redforce04 Oct 28, 2023
6884490
updates
Redforce04 Oct 28, 2023
b4f1ddb
Merge remote-tracking branch 'origin/Feature_New_Games' into local_dev
Redforce04 Oct 28, 2023
0a724aa
Merge remote-tracking branch 'origin/HalloweenBeta' into local_dev
Redforce04 Oct 28, 2023
5b47d34
Merge remote-tracking branch 'origin/Feature_Ghostbusters' into local…
Redforce04 Oct 28, 2023
a0e9cbe
fix
Redforce04 Oct 28, 2023
86d803f
Merge remote-tracking branch 'upstream/dev' into dev
Redforce04 Oct 28, 2023
f4b530a
Merge branch 'dev' into local_dev
Redforce04 Oct 28, 2023
c6ed503
Huge Merge
Redforce04 Oct 28, 2023
1c378e2
Merge pull request #55 from Redforce04/local_dev
Redforce04 Oct 28, 2023
ccedc31
Merge branch 'dev_1' into dev
RisottoMan Oct 28, 2023
f7130d9
Merge pull request #56 from KoT0XleB/dev
RisottoMan Oct 28, 2023
78770fd
added amongus map
RisottoMan Oct 28, 2023
09f570a
fix traitor event
RisottoMan Oct 28, 2023
cf2cd80
Minor Reworks and Balancing
Redforce04 Oct 29, 2023
e5b5750
Final Changes
Redforce04 Oct 29, 2023
7a6b971
Merge pull request #57 from Redforce04/local_dev
Redforce04 Oct 29, 2023
ba9d122
Merge pull request #58 from KoT0XleB/dev
RisottoMan Oct 29, 2023
7f02c9a
Add files via upload
RisottoMan Oct 29, 2023
959ac4e
Update README.md
RisottoMan Oct 29, 2023
73e2603
Fixed TTT mg
RisottoMan Oct 29, 2023
1ab7245
Merge remote-tracking branch 'upstream/dev_1' into local_dev
Redforce04 Oct 29, 2023
f6c0a70
Update
Redforce04 Oct 29, 2023
144f854
More changes
Redforce04 Oct 30, 2023
b8bf9f5
Merge pull request #60 from KoT0XleB/dev
RisottoMan Oct 30, 2023
112b15f
added ff disabled in tdm and spleef
RisottoMan Oct 30, 2023
92730e2
adding changes from main
RisottoMan Oct 30, 2023
ac73148
Merge branch 'dev_1' into main
RisottoMan Oct 30, 2023
1f07e67
Merge pull request #61 from KoT0XleB/main
RisottoMan Oct 30, 2023
dffb6eb
Hotfix for v9.2.4
RisottoMan Oct 30, 2023
292bd01
Merge pull request #62 from KoT0XleB/dev_1
RisottoMan Oct 30, 2023
c0a753b
add from untracked
Redforce04 Oct 30, 2023
63e9806
Merge remote-tracking branch 'upstream/dev' into local_dev
Redforce04 Oct 30, 2023
9159bd0
Update powerups
Redforce04 Nov 1, 2023
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
429 changes: 426 additions & 3 deletions .gitignore

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion AutoEvent/API/ArtificialHealth.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class ArtificialHealth
public ArtificialHealth(){}

public ArtificialHealth(float initialHealth, float maxHealth = 100f, float regenerationAmount = 1f, float absorptionPercent = 100, bool permanent = true, float duration = 10f, bool clearOtherInstances = true)
{
{
InitialAmount = initialHealth;
MaxAmount = maxHealth;
RegenerationAmount = regenerationAmount;
Expand Down
2 changes: 1 addition & 1 deletion AutoEvent/API/BitwiseExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
namespace AutoEvent.API;

public static class BitwiseExtensions
{
{
/*public static T AppendSeparateEnumValue<T>(this T value, Enum append) where T : Enum
{
Enum[] valuesToAppend = (Enum[])Enum.GetValues(append.GetType());
Expand Down
65 changes: 65 additions & 0 deletions AutoEvent/API/Components/DestructiblePrimitiveComponent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
// <copyright file="Log.cs" company="Redforce04#4091">
// Copyright (c) Redforce04. All rights reserved.
// </copyright>
// -----------------------------------------
// Solution: AutoEvent
// Project: AutoEvent
// FileName: DestructiblePrimitiveComponent.cs
// Author: Redforce04#4091
// Revision Date: 10/17/2023 6:46 PM
// Created Date: 10/17/2023 6:46 PM
// -----------------------------------------

using System;
using AdminToys;
using Mirror;
using PlayerStatsSystem;
using UnityEngine;

namespace AutoEvent.API.Components;

public class DestructiblePrimitiveComponent : UnityEngine.MonoBehaviour, IDestructible
{
public bool Damage(float damage, DamageHandlerBase handler, Vector3 exactHitPos)
{
var ev = new DamagingPrimitiveArgs(damage, handler, exactHitPos);
DamagingPrimitive?.Invoke(ev);
if (!ev.IsAllowed)
{
return false;
}

Health -= ev.Damage;
if (Health <= 0)
{

var prim = gameObject.GetComponent<PrimitiveObjectToy>();
NetworkServer.UnSpawn(base.gameObject);
Destroy(gameObject);
}

return true;
}

public uint NetworkId { get; }
public Vector3 CenterOfMass { get; }
public float Health { get; private set; }
public event Action<DamagingPrimitiveArgs> DamagingPrimitive;

}

public class DamagingPrimitiveArgs
{
public DamagingPrimitiveArgs(float damage, DamageHandlerBase handler, Vector3 exactHitPos, bool isAllowed = true)
{
Damage = damage;
Handler = handler;
ExactHitPosition = exactHitPos;
IsAllowed = isAllowed;
}
public float Damage { get; set; }
public DamageHandlerBase Handler { get; init; }
public Vector3 ExactHitPosition { get; set; }
public bool IsAllowed { get; set; }

}
19 changes: 19 additions & 0 deletions AutoEvent/API/Enums/Effects.cs
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,23 @@ public enum StatusEffect
/// Teleports the player to the pocket dimension and drains health until the player escapes or is killed.
/// </summary>
PocketCorroding,

/// <summary>
/// The effect permit player to go trough door like Scp-106.
/// </summary>
Ghostly,

/// <summary>
/// Effect given to player when being strangled by SCP-3114.
/// </summary>
Strangled,
OrangeCandy,
Spicy,
SugarCrave,
SugarHigh,
SugarRush,
TraumatizedByEvil,
Metal,
Prismatic,
SlowMetabolism,
}
56 changes: 28 additions & 28 deletions AutoEvent/API/Enums/LoadoutFlags.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,80 +25,80 @@ public enum LoadoutFlags
/// No flags are specified. Loadouts will be applied normally.
/// </summary>
None = 0,

/// <summary>
/// Players will not have a role set.
/// </summary>
IgnoreRole = 1,
IgnoreRole = 1 << 0, // 1

/// <summary>
/// Players will not have items added.
/// </summary>
IgnoreItems = 2,
IgnoreItems = 1 << 1, // 2

/// <summary>
/// Players will not have their default role items cleared before adding items.
/// </summary>
DontClearDefaultItems = 4,
DontClearDefaultItems = 1 << 2, // 4

/// <summary>
/// Players won't have effects applied to them.
/// </summary>
IgnoreEffects = 8,
IgnoreEffects = 1 << 3, // 8

/// <summary>
/// Players won't have their health set.
/// </summary>
IgnoreHealth = 16,
IgnoreHealth = 1 << 4, // 16

/// <summary>
/// Player's won't have their Artificial Health set.
/// </summary>
IgnoreAHP = 32,
IgnoreAHP = 1 << 5, // 32

/// <summary>
/// Player's won't have their sizes changed.
/// </summary>
IgnoreSize = 64,
IgnoreSize = 1 << 6, // 64

/// <summary>
/// Player's won't have infinite ammo applied from loadouts.
/// </summary>
IgnoreInfiniteAmmo = 128,
IgnoreInfiniteAmmo = 1 << 7, // 128

/// <summary>
/// Players will have infinite ammo applied. Overrides IgnoreInfiniteAmmo.
/// </summary>
ForceInfiniteAmmo = 256,
ForceInfiniteAmmo = 1 << 8, // 256

/// <summary>
/// Players will note have Godmode set.
/// </summary>
IgnoreGodMode = 512,
IgnoreGodMode = 1 << 9, // 512

/// <summary>
/// Players will not recieve weapons.
/// </summary>
IgnoreWeapons = 1024,
IgnoreWeapons = 1 << 10, // 1024

/// <summary>
/// Stamina will not be added.
/// </summary>
IgnoreStamina = 2048,
IgnoreStamina = 1 << 11, // 2048,

/// <summary>
/// The player will have an endless amount of ammo.
/// </summary>
ForceEndlessClip = 4096,
ForceEndlessClip = 1 << 12, // 4096,

/// <summary>
/// The player will stay in the default spawn point.
/// </summary>
UseDefaultSpawnPoint = 8192,
UseDefaultSpawnPoint = 1 << 13, //8192,

/// <summary>
/// Only give players items.
/// </summary>
ItemsOnly = 16382,
ItemsOnly = (IgnoreStamina | IgnoreGodMode | IgnoreInfiniteAmmo | IgnoreSize | IgnoreAHP | IgnoreHealth | IgnoreStamina | IgnoreEffects | IgnoreRole), // None + ForceX
// 16384
}
7 changes: 5 additions & 2 deletions AutoEvent/API/Extensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
using AutoEvent.Events.EventArgs;
using AutoEvent.Games.Battle;
using AutoEvent.Games.Line;
using AutoEvent.Patches;
using CustomPlayerEffects;
using Exiled.API.Features.Items;
using Footprinting;
Expand All @@ -30,6 +31,7 @@
using InventorySystem.Items.Keycards;
using InventorySystem.Items.Usables.Scp244.Hypothermia;
using JetBrains.Annotations;
using PlayerRoles.Ragdolls;
using PluginAPI.Core.Items;
using Debug = AutoEvent.Commands.Debug.Debug;
using Item = PluginAPI.Core.Items.Item;
Expand Down Expand Up @@ -505,8 +507,8 @@ public static ReferenceHub AddDummy()
var fakeConnection = new FakeConnection(0);
var hubPlayer = newPlayer.GetComponent<ReferenceHub>();
NetworkServer.AddPlayerForConnection(fakeConnection, newPlayer);
hubPlayer.characterClassManager.InstanceMode = ClientInstanceMode.Unverified;

hubPlayer.authManager.InstanceMode = CentralAuth.ClientInstanceMode.Unverified;
// CharacterClassManager.instance
try
{
hubPlayer.nicknameSync.SetNick("MiniGames");
Expand Down Expand Up @@ -596,6 +598,7 @@ public static void GrenadeSpawn(float fuseTime, Vector3 pos, float scale)

NetworkServer.Spawn(grenade.gameObject);
grenade.ServerActivate();

}
}
}
97 changes: 97 additions & 0 deletions AutoEvent/API/RockEffectGrenade.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
/*// <copyright file="Log.cs" company="Redforce04#4091">
// Copyright (c) Redforce04. All rights reserved.
// </copyright>
// -----------------------------------------
// Solution: AutoEvent
// Project: AutoEvent
// FileName: RockEffectGrenade.cs
// Author: Redforce04#4091
// Revision Date: 10/29/2023 7:13 PM
// Created Date: 10/29/2023 7:13 PM
// -----------------------------------------

using System.Diagnostics;
using InventorySystem.Items.ThrowableProjectiles;
using Mirror;
using UnityEngine;

namespace AutoEvent.API;

public class RockEffectGrenade : EffectGrenade
{
private static readonly CachedLayerMask HitboxLayer = new CachedLayerMask("Hitbox");

private static readonly Collider[] Detections = new Collider[8];

private const float MinSelfDamageDelay = 0.1f;

private const float DetectorThickness = 0.07f;

private readonly Stopwatch _selfDamageStopwatch = Stopwatch.StartNew();

[SerializeField] private Transform _centerTransform;

private Vector3 _prevPosition;

override void Awake()
{
base.Awake();
_prevPosition = _centerTransform.position;
}

override void FixedUpdate()
{
FixedUpdate(); ;
if (NetworkServer.active)
{
DetectPlayers();
}
}

public override void ProcessCollision(Collision collision)
{
if (NetworkServer.active)
{
DestroyProjectile();
}
}

protected virtual void OnCollision(ReferenceHub hub)
{
if (NetworkServer.active)
{
DestroyProjectile();
}
}

protected void DestroyProjectile()
{
if (NetworkServer.active)
{
ServerFuseEnd();
}
}

private void DetectPlayers()
{
Vector3 prevPosition = _prevPosition;
_prevPosition = _centerTransform.position;
int num = Physics.OverlapCapsuleNonAlloc(prevPosition, _prevPosition, 0.07f, Detections, HitboxLayer);
for (int i = 0; i < num; i++)
{
if (Detections[i].TryGetComponent<HitboxIdentity>(out var component))
{
ReferenceHub targetHub = component.TargetHub;
if (!(targetHub == PreviousOwner.Hub) ||
!(_selfDamageStopwatch.Elapsed.TotalSeconds < 0.10000000149011612))
{
OnCollision(targetHub);
}
}
}
}

private void MirrorProcessed()
{
}
}*/
31 changes: 31 additions & 0 deletions AutoEvent/ActiveFeatures.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// <copyright file="Log.cs" company="Redforce04#4091">
// Copyright (c) Redforce04. All rights reserved.
// </copyright>
// -----------------------------------------
// Solution: AutoEvent
// Project: AutoEvent
// FileName: ActiveFeatures.cs
// Author: Redforce04#4091
// Revision Date: 10/24/2023 10:20 PM
// Created Date: 10/24/2023 10:20 PM
// -----------------------------------------

using System;

namespace AutoEvent;

[Flags]
public enum ActiveFeatures
{
None = 0,
Minigames20 = 1,
Lobby = 2,
Vote = 4,
Powerups = 8,
SchematicApi = 16,
BuildInfo = 32,
MinigameSpleef = 64,
InventoryMenuApi,
MinigamesGhostBusters,
All = ~0,
}
Loading