Skip to content

Commit c295e4f

Browse files
committed
smaller fixes
1 parent ea08c0a commit c295e4f

File tree

4 files changed

+5
-98
lines changed

4 files changed

+5
-98
lines changed

MoreWeapons/Configs/SniperConfig.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
using System.ComponentModel;
2+
using Neuron.Core.Meta;
23
using Syml;
34

45
namespace MoreWeapons.Configs;
56

6-
//[Automatic]
7+
[Automatic]
78
[DocumentSection("Sniper")]
89
public class SniperConfig : IDocumentSection
910
{

MoreWeapons/Configs/VaccinePistolConfig.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace MoreWeapons.Configs;
77

8-
//[Automatic]
8+
[Automatic]
99
[DocumentSection("VaccinePistol")]
1010
public class VaccinePistolConfig : IDocumentSection
1111
{

MoreWeapons/EventHandlers.cs

-95
Original file line numberDiff line numberDiff line change
@@ -96,98 +96,3 @@ public void Test(KeyPressEvent ev)
9696
}
9797
}
9898
}
99-
100-
/*
101-
public class EventHandlers
102-
{
103-
104-
//Used by:
105-
//Tranquilizer
106-
//GrenadLauncher
107-
//MedkitGun
108-
//VaccinePistole
109-
private void OnShoot(PlayerShootEventArgs ev)
110-
{
111-
switch (ev.Weapon?.ID)
112-
{
113-
case (int)CustomItemType.MedkitGun:
114-
ev.Player.PlayerInteract.OnInteract();
115-
ev.Allow = false;
116-
ev.Weapon.Durabillity--;
117-
118-
if (ev.Target != null)
119-
{
120-
ev.Target.Heal(PluginClass.MedkitGunConfig.HealAmount);
121-
Hitmarker.SendHitmarker(ev.Player.Connection, 1f);
122-
}
123-
break;
124-
125-
case (int)CustomItemType.VaccinePistol:
126-
ev.Player.PlayerInteract.OnInteract();
127-
ev.Allow = false;
128-
ev.Weapon.Durabillity--;
129-
130-
if (ev.Target != null)
131-
{
132-
Hitmarker.SendHitmarker(ev.Player.Connection, 1f);
133-
134-
if (ev.Target.RoleID == (int)RoleType.Scp0492)
135-
{
136-
var pos = ev.Target.Position;
137-
ev.Target.ChangeRoleAtPosition(PluginClass.VPConfig.ReplaceRoles.ElementAt(Random.Range(0, PluginClass.VPConfig.ReplaceRoles.Count)));
138-
ev.Target.Position = pos;
139-
}
140-
else
141-
{
142-
ev.Target.Hurt(PluginClass.VPConfig.Heal);
143-
ev.Target.PlayerEffectsController.UseMedicalItem(ItemType.SCP500);
144-
}
145-
}
146-
break;
147-
}
148-
}
149-
150-
//Used by:
151-
//Tranquilizer
152-
//MedkitGun
153-
//SCP-127
154-
//Sniper
155-
//GrenadeLauncher
156-
//VaccinePistole
157-
private void OnReload(PlayerReloadEventArgs ev)
158-
{
159-
switch (ev.Item?.ID)
160-
{
161-
162-
case (int)CustomItemType.MedkitGun:
163-
ev.Allow = false;
164-
165-
if (!PluginClass.MedkitGunConfig.CanBeReloaded)
166-
return;
167-
168-
foreach (var medkit in ev.Player.Inventory.Items.Where(x => x.ID == (int)ItemType.Medkit))
169-
{
170-
if (ev.Item.Durabillity >= PluginClass.MedkitGunConfig.MagazineSize)
171-
return;
172-
173-
medkit.Destroy();
174-
ev.Item.Durabillity++;
175-
}
176-
break;
177-
178-
case (int)CustomItemType.VaccinePistol:
179-
ev.Allow = false;
180-
181-
foreach (var scp500 in ev.Player.Inventory.Items.Where(x => x.ID == (int)ItemType.SCP500))
182-
{
183-
if (ev.Item.Durabillity >= PluginClass.VPConfig.MagazineSize)
184-
return;
185-
186-
scp500.Destroy();
187-
ev.Item.Durabillity++;
188-
}
189-
break;
190-
}
191-
}
192-
}
193-
*/

MoreWeapons/Items/VaccinePistol.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ public override void OnShoot(ShootEvent ev)
3333
}
3434
else
3535
{
36-
ev.Target.Heal(MoreWeapons.VPConfig.Heal);
36+
ev.Target.Heal(MoreWeapons.VPConfig.Heal);
37+
ev.Target.PlayerEffectsController.UseMedicalItem(ItemType.SCP500);
3738
}
3839
Hitmarker.SendHitmarker(ev.Player.Connection, 1f);
3940
}

0 commit comments

Comments
 (0)