Skip to content

Commit 3634449

Browse files
NOTIF-APINOTIF-API
authored
Add files via upload
1 parent 2e57d85 commit 3634449

File tree

9 files changed

+87
-14
lines changed

9 files changed

+87
-14
lines changed

‎SCP-600V/API/Players/Scp600manager.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ internal static void Add(Player ply)
4949
ply.ReferenceHub.nicknameSync.ShownPlayerInfo &= ~PlayerInfoArea.Nickname;
5050
ply.ReferenceHub.nicknameSync.ShownPlayerInfo &= ~PlayerInfoArea.UnitName;
5151
ply.ReferenceHub.nicknameSync.ShownPlayerInfo &= ~PlayerInfoArea.Role;
52-
ply.EnableEffect(new Effect(EffectType.Bleeding, 9999f));
52+
if (Sai.Instance.Config.CanBleading)
53+
{
54+
ply.EnableEffect(new Effect(EffectType.Bleeding, 9999f));
55+
}
5356
}
5457
}
5558
}

‎SCP-600V/Command/ChengeClass.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace SCP_600V.Command
1313
[CommandHandler(typeof(CommandHandler))]
1414
internal class ChengeClass : ICommand
1515
{
16-
public string Command { get; set; } = "ChangeClass";
16+
public string Command { get; set; } = "fdghfgfddfggvbdfgvfbhtr65b5654v5hbrtbfdhdf545";
1717

1818
public string[] Aliases { get; set; } = { "ChCls", "newclass" };
1919

‎SCP-600V/Config.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,12 @@ internal class Config : IConfig
3939
/// Percentage to spawn stsp at the beginning of the game
4040
/// </summary>
4141
[Description("Percentage to spawn stsp at the beginning of the game")]
42-
public int PercentToSpawn { get; set; } = 10;
42+
public int PercentToSpawn { get; set; } = 25;
43+
/// <summary>
44+
/// determines if SCP-600 will take damage over its lifetime
45+
/// </summary>
46+
[Description("determines if SCP-600 will take damage over its lifetime")]
47+
public bool CanBleading { get; set; } = true;
4348
/// <summary>
4449
/// Spawn message for SCP-600V
4550
/// </summary>

‎SCP-600V/EventHandler/GameEvent/OnDeath.cs‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Exiled.API.Enums;
99
using MEC;
1010
using Exiled.API.Features.Items;
11+
using System;
1112

1213
namespace SCP_600V.EventHandler.GameEvent
1314
{
@@ -37,6 +38,7 @@ public void OnPlayerKill(EvArg.Player.DiedEventArgs ev)
3738
Log.Debug("Attacker is scp600");
3839
if (role != RoleTypeId.Spectator)
3940
{
41+
Dictionary<ItemType, ushort> amos = ev.Attacker.Ammo;
4042
if (role != ev.Attacker.Role.Type)
4143
{
4244
foreach (Item.Item a in ev.Attacker.Items)
@@ -45,14 +47,24 @@ public void OnPlayerKill(EvArg.Player.DiedEventArgs ev)
4547
}
4648
Timing.CallDelayed(0.3f, () =>
4749
{
50+
Timing.CallDelayed(0.3f, () =>
51+
{
52+
foreach (KeyValuePair<ItemType, ushort> a in amos)
53+
{
54+
ev.Attacker.AddItem(a.Key, Convert.ToInt16(a.Value)/4);
55+
}
56+
});
4857
ev.Attacker.Role.Set(role, SpawnReason.ForceClass, RoleSpawnFlags.None);
4958
ev.Attacker.Teleport(poso);
5059
ev.Attacker.AddItem(items);
5160
ev.Attacker.Health = hea;
5261
ev.Attacker.MaxHealth = mhea;
5362
ev.Attacker.Broadcast(message: $"{Sai.Instance.Config.MessageScpTransform.Replace("{player}", ev.Player.Nickname)}", duration: 5);
54-
ev.Attacker.EnableEffect(new Effect(EffectType.Bleeding, 9999f));
55-
ev.Attacker.Heal(10);
63+
if (Sai.Instance.Config.CanBleading)
64+
{
65+
ev.Attacker.EnableEffect(new Effect(EffectType.Bleeding, 9999f));
66+
ev.Attacker.Heal(10);
67+
}
5668
Log.Debug("Scp600 get new role");
5769
});
5870
}

‎SCP-600V/EventHandler/GameEvent/OnRoleChenged.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@ internal class OnRoleChenged
99
{
1010
public void OnRoleChenge(EvArg.Player.ChangingRoleEventArgs e)
1111
{
12-
if (SCP_600V.API.Players.Scp600PlyGet.IsScp600(e.Player))
12+
if (e.Player != null)
1313
{
14-
if (e.NewRole == PlayerRoles.RoleTypeId.Spectator)
15-
{
16-
17-
}
14+
1815
}
1916
}
2017
}

‎SCP-600V/EventHandler/GameEvent/Scp173.cs‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
using Exiled.API.Features;
2+
using EvArg = Exiled.Events.EventArgs;
3+
using api = SCP_600V.API.Players.Scp600PlyGet;
4+
5+
namespace SCP_600V.EventHandler.GameEvent
6+
{
7+
internal class Scp173
8+
{
9+
internal void OnScp173Visibled(EvArg.Scp173.BlinkingEventArgs e)
10+
{
11+
if (e.Player != null)
12+
{
13+
if (e.Targets != null)
14+
{
15+
int Scp600ply = 0;
16+
foreach (Player target in e.Targets)
17+
{
18+
if (target != null)
19+
{
20+
if (api.IsScp600(target))
21+
{
22+
Scp600ply++;
23+
}
24+
}
25+
}
26+
if (e.Targets.Count == Scp600ply)
27+
{
28+
e.IsAllowed = false;
29+
}
30+
else
31+
{
32+
e.IsAllowed = true;
33+
}
34+
}
35+
}
36+
}
37+
}
38+
}

‎SCP-600V/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// Можно задать все значения или принять номера сборки и редакции по умолчанию
3333
// используя "*", как показано ниже:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.6.6.0")]
36-
[assembly: AssemblyFileVersion("1.6.6.0")]
35+
[assembly: AssemblyVersion("1.7.0.0")]
36+
[assembly: AssemblyFileVersion("1.7.0.0")]

‎SCP-600V/SCP-600V.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@
5353
<Reference Include="Exiled.API">
5454
<HintPath>..\..\..\..\AppData\Roaming\EXILED\Plugins\dependencies\Exiled.API.dll</HintPath>
5555
</Reference>
56+
<Reference Include="Exiled.CustomItems, Version=6.0.2.0, Culture=neutral, processorArchitecture=AMD64">
57+
<SpecificVersion>False</SpecificVersion>
58+
<HintPath>..\..\..\..\AppData\Roaming\EXILED\Plugins\Exiled.CustomItems.dll</HintPath>
59+
</Reference>
5660
<Reference Include="Exiled.CustomRoles">
5761
<HintPath>..\..\..\..\AppData\Roaming\EXILED\Plugins\Exiled.CustomRoles.dll</HintPath>
5862
</Reference>
@@ -115,6 +119,7 @@
115119
<Compile Include="EventHandler\GameEvent\OnDeath.cs" />
116120
<Compile Include="EventHandler\GameEvent\OnRoleChenged.cs" />
117121
<Compile Include="EventHandler\GameEvent\Scp106.cs" />
122+
<Compile Include="EventHandler\GameEvent\Scp173.cs" />
118123
<Compile Include="EventHandler\RoundEvent\EndingRound.cs" />
119124
<Compile Include="EventHandler\RoundEvent\StartingRound.cs" />
120125
<Compile Include="EventHandler\UserEvent\UserVerefieded.cs" />

‎SCP-600V/Sai.cs‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ internal class Sai: Plugin<Config>
1515
public EventHandler.GameEvent.OnRoleChenged orc;
1616
public EventHandler.GameEvent.Scp106 spd;
1717
public EventHandler.UserEvent.UserVerefieded uvf;
18+
//public EventHandler.GameEvent.Scp173 s1;
1819

1920
public override void OnEnabled()
2021
{
@@ -25,15 +26,17 @@ public override void OnEnabled()
2526
odmg = new EventHandler.GameEvent.OnDamage();
2627
ode = new EventHandler.GameEvent.OnDeath();
2728
orc = new EventHandler.GameEvent.OnRoleChenged();
28-
spd = new SCP_600V.EventHandler.GameEvent.Scp106();
29-
uvf = new SCP_600V.EventHandler.UserEvent.UserVerefieded();
29+
spd = new EventHandler.GameEvent.Scp106();
30+
uvf = new EventHandler.UserEvent.UserVerefieded();
31+
//s1 = new EventHandler.GameEvent.Scp173();
3032
Hand.Server.RoundStarted += str.OnRoundStarted;
3133
Hand.Server.EndingRound += er.OnEndingRound;
3234
Hand.Player.Hurting += odmg.DamageHandler;
3335
Hand.Player.Died += ode.OnPlayerKill;
3436
Hand.Player.ChangingRole += orc.OnRoleChenge;
3537
Hand.Player.EnteringPocketDimension += spd.OnPocketDemensionCapture;
3638
Hand.Player.Verified += uvf.OnVerefy;
39+
//Hand.Scp173.Blinking += s1.OnScp173Visibled;
3740
}
3841
public override void OnDisabled()
3942
{
@@ -42,10 +45,20 @@ public override void OnDisabled()
4245
str = null;
4346
er = null;
4447
odmg = null;
48+
ode = null;
49+
orc = null;
50+
spd = null;
51+
uvf = null;
52+
//s1 = null;
4553

4654
Hand.Server.RoundStarted -= str.OnRoundStarted;
4755
Hand.Server.EndingRound -= er.OnEndingRound;
4856
Hand.Player.Hurting -= odmg.DamageHandler;
57+
Hand.Player.Died -= ode.OnPlayerKill;
58+
Hand.Player.ChangingRole -= orc.OnRoleChenge;
59+
Hand.Player.EnteringPocketDimension -= spd.OnPocketDemensionCapture;
60+
Hand.Player.Verified -= uvf.OnVerefy;
61+
//Hand.Scp173.Blinking -= s1.OnScp173Visibled;
4962
}
5063
}
5164
}

0 commit comments

Comments
 (0)