Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SynapseSL/MoreWeapons
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v.1.0.1
Choose a base ref
...
head repository: SynapseSL/MoreWeapons
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 1,017 additions and 647 deletions.
  1. +14 −0 MoreWeapons/App.config
  2. +19 −14 MoreWeapons/Configs/GrenadeLauncherConfig.cs
  3. +19 −0 MoreWeapons/Configs/MedkitGunConfig.cs
  4. +14 −12 MoreWeapons/Configs/Scp127Config.cs
  5. +20 −0 MoreWeapons/Configs/Scp1499Config.cs
  6. +0 −29 MoreWeapons/Configs/ShotGunConfig.cs
  7. +17 −12 MoreWeapons/Configs/SniperConfig.cs
  8. +21 −23 MoreWeapons/Configs/TranquilizerConfig.cs
  9. +29 −0 MoreWeapons/Configs/VaccinePistolConfig.cs
  10. +13 −0 MoreWeapons/Configs/XlMedkitConfig.cs
  11. +6 −6 MoreWeapons/CustomItemType.cs
  12. +98 −0 MoreWeapons/EventHandlers.cs
  13. +16 −0 MoreWeapons/ExplodeScript.cs
  14. +0 −67 MoreWeapons/Handlers/GrenadeLauncherHandler.cs
  15. +0 −61 MoreWeapons/Handlers/Scp127Handler.cs
  16. +0 −125 MoreWeapons/Handlers/ShotGunHandler.cs
  17. +0 −53 MoreWeapons/Handlers/SniperHandler.cs
  18. +0 −124 MoreWeapons/Handlers/TranquilizerHandler.cs
  19. +0 −32 MoreWeapons/Handlers/XlMedkitHandler.cs
  20. +49 −0 MoreWeapons/Items/GrenadeLauncher.cs
  21. +31 −0 MoreWeapons/Items/MedkitGun.cs
  22. +25 −0 MoreWeapons/Items/MoreWeaponsItemHandler.cs
  23. +62 −0 MoreWeapons/Items/Scp127.cs
  24. +54 −0 MoreWeapons/Items/Scp1499.cs
  25. +45 −0 MoreWeapons/Items/Sniper.cs
  26. +32 −0 MoreWeapons/Items/Tranquilizer.cs
  27. +41 −0 MoreWeapons/Items/VaccinePistol.cs
  28. +41 −0 MoreWeapons/Items/XlMedkit.cs
  29. +45 −0 MoreWeapons/MoreWeapons.cs
  30. +98 −28 MoreWeapons/MoreWeapons.csproj
  31. +122 −0 MoreWeapons/MoreWeaponsScript.cs
  32. +24 −0 MoreWeapons/MoreWeaponsTranslation.cs
  33. +0 −41 MoreWeapons/PluginClass.cs
  34. +2 −3 MoreWeapons/Properties/AssemblyInfo.cs
  35. +15 −0 MoreWeapons/Scp1499Dimension.cs
  36. +18 −4 MoreWeapons/packages.config
  37. +27 −13 README.md
14 changes: 14 additions & 0 deletions MoreWeapons/App.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?><configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
33 changes: 19 additions & 14 deletions MoreWeapons/Configs/GrenadeLauncherConfig.cs
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
using Synapse.Config;
using System.ComponentModel;
using System.ComponentModel;
using Neuron.Core.Meta;
using Syml;

namespace MoreWeapons.Configs
namespace MoreWeapons.Configs;

[Automatic]
[DocumentSection("Grenade Launcher")]
public class GrenadeLauncherConfig : IDocumentSection
{
public class GrenadeLauncherConfig : AbstractConfigSection
{
[Description("If the grenade launcher can be reloaded with grenades")]
public bool CanBeReloaded = true;
[Description("If the grenade launcher can be reloaded with grenades")]
public bool CanBeReloaded { get; set; } = true;

[Description("How many grenades can be loaded into the grenade launcher")]
public int MagazineSize { get; set; } = 3;

[Description("How many grenades can be loaded into the grenade launcher")]
public int MagazineSize = 10;
[Description("With how much force the Grenades should fly")]
public float ForceMultiplier { get; set; } = 1;

[Description("With how much force the Grenades should fly")]
public float ForceMultiplier = 1;
[Description("After what amount of time the grenades Explodes")]
public float GrenadeFuseTime { get; set; } = 2f;

[Description("After what amount of time the grenades Explodes")]
public float GrenadeFuseTime = 0.75f;
}
[Description("If Enabled the Grenade will Explode as soon as it hits any object")]
public bool ExplodeOnCollision { get; set; } = true;
}
19 changes: 19 additions & 0 deletions MoreWeapons/Configs/MedkitGunConfig.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System.ComponentModel;
using Neuron.Core.Meta;
using Syml;

namespace MoreWeapons.Configs;

[Automatic]
[DocumentSection("MedkitGun")]
public class MedkitGunConfig : IDocumentSection
{
[Description("The amount that the MedkitGun heals")]
public float HealAmount { get; set; } = 150f;

[Description("The amount of medkits that can be in one Medkit")]
public int MagazineSize { get; set; } = 3;

[Description("If the Medkitgun can be reloaded")]
public bool CanBeReloaded { get; set; } = true;
}
26 changes: 14 additions & 12 deletions MoreWeapons/Configs/Scp127Config.cs
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
using Synapse.Config;
using System.ComponentModel;
using System.ComponentModel;
using Neuron.Core.Meta;
using Syml;

namespace MoreWeapons.Configs
namespace MoreWeapons.Configs;

[Automatic]
[DocumentSection("SCP 127")]
public class Scp127Config : IDocumentSection
{
public class Scp127Config : AbstractConfigSection
{
[Description("The intervall in which Scp127 reloads ammo")]
public float ReloadIntervall = 30f;
[Description("The intervall in which Scp127 reloads ammo")]
public float ReloadInterval { get; set; } = 30f;

[Description("The Amount of ammo that reloads each intervall")]
public float ReloadAmount = 5;
[Description("The Amount of ammo that reloads each intervall")]
public int ReloadAmount { get; set; } = 5;

[Description("The max Amount of ammo it can reload")]
public float MaxAmmo = 75;
}
[Description("The max Amount of ammo it can reload")]
public int MaxAmmo { get; set; } = 75;
}
20 changes: 20 additions & 0 deletions MoreWeapons/Configs/Scp1499Config.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using System.ComponentModel;
using Neuron.Core.Meta;
using Syml;
using Synapse3.SynapseModule.Config;

namespace MoreWeapons.Configs;

[Automatic]
[DocumentSection("SCP 1499")]
public class Scp1499Config : IDocumentSection
{
[Description("Where The Schematic 1499 should spawn")]
public SerializedVector3 DimensionPosition { get; set; } = new (0f, 900f, 0f);

[Description("The time after which the Player gets forced out of Scp1499")]
public float Scp1499ResidenceTime { get; set; } = 20f;

[Description("The Cooldown that Scp1499 gives")]
public float Cooldown { get; set; } = 5f;
}
29 changes: 0 additions & 29 deletions MoreWeapons/Configs/ShotGunConfig.cs

This file was deleted.

29 changes: 17 additions & 12 deletions MoreWeapons/Configs/SniperConfig.cs
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
using Synapse.Config;
using System.ComponentModel;
using System.ComponentModel;
using Neuron.Core.Meta;
using Syml;

namespace MoreWeapons.Configs
namespace MoreWeapons.Configs;

[Automatic]
[DocumentSection("Sniper")]
public class SniperConfig : IDocumentSection
{
public class SniperConfig : AbstractConfigSection
{
[Description("The max amount of bullets that can be in the sniper")]
public int MagazineSize = 1;
[Description("The max amount of bullets that can be in the sniper")]
public int MagazineSize { get; set; } = 1;

[Description("The Ammount of Ammo5 needed to reload one sniper bullet")]
public int AmmoNeededForOneShoot { get; set; } = 10;

[Description("The Ammount of Ammo5 needed to reload one sniper bullet")]
public int AmooNeededForOneShoot = 10;
[Description("The damage which the sniper does")]
public float Damage { get; set; } = 150f;

[Description("The damage which the sniper does")]
public float Damage = 150f;
}
[Description("The Delay between the Shots the Player needs to wait")]
public float DelayBetweenShots { get; set; } = 5f;
}
44 changes: 21 additions & 23 deletions MoreWeapons/Configs/TranquilizerConfig.cs
Original file line number Diff line number Diff line change
@@ -1,33 +1,31 @@
using Synapse.Config;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using Neuron.Core.Meta;
using Syml;

namespace MoreWeapons.Configs
{
public class TranquilizerConfig : AbstractConfigSection
{
[Description("The Amount of bullets that can be in the Tranquilizer")]
public int MagazineSize = 1;

[Description("The Ammount of Ammo9 needed to reload one tranquilizer bullet")]
public int AmooNeededForOneShoot = 10;
namespace MoreWeapons.Configs;

[Description("The Maximal Amount of time a Player can be stuned")]
public float MaxStunTime = 15f;
[Automatic]
[Serializable]
[DocumentSection("Tranquilizer")]
public class TranquilizerConfig : IDocumentSection
{
[Description("The Amount of bullets that can be in the Tranquilizer")]
public int MagazineSize { get; set; } = 1;

[Description("The Minimal Amount of time a Player is stuned")]
public float MinStunTime = 10f;
[Description("The Ammount of Ammo9 needed to reload one tranquilizer bullet")]
public int AmmoNeededForOneShoot { get; set; } = 10;

[Description("If Enabled a Player who got shoot at with a tranquilizer drops all his Items")]
public bool DropInventory = false;
[Description("The Maximal Amount of time a Player can be stuned")]
public float MaxStunTime { get; set; } = 15f;

[Description("If Enabled a Ragdoll will Spawn at the Position where the Player is tranquilized")]
public bool SpawnRagdoll = true;
[Description("The Minimal Amount of time a Player is stuned")]
public float MinStunTime { get; set; } = 10f;

[Description("If Enabled the Tranquilizer can be Reloaded with 18 Ammo9")]
public bool Reloadable = true;
[Description("If Enabled the Tranquilizer can be Reloaded with 18 Ammo9")]
public bool Reloadable { get; set; } = true;

[Description("All RoleIds in this List cant be stuned (also CustomRoles)")]
public List<int> BlockedIDs = new List<int>() { (int)RoleType.Scp173, (int)RoleType.Scp106 };
}
[Description("All RoleIds in this List can't be stuned (also CustomRoles)")]
public List<uint> BlockedIDs { get; set; } = new() { (uint)RoleType.Scp106, (uint)RoleType.Scp173 };
}
29 changes: 29 additions & 0 deletions MoreWeapons/Configs/VaccinePistolConfig.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
using System.Collections.Generic;
using System.ComponentModel;
using Neuron.Core.Meta;
using Syml;

namespace MoreWeapons.Configs;

[Automatic]
[DocumentSection("VaccinePistol")]
public class VaccinePistolConfig : IDocumentSection
{
[Description("The Roles that SCP-049-2 can be replaced with when hit by the VaccinePistole")]
public List<RoleType> ReplaceRoles { get; set; } = new()
{
RoleType.ClassD,
RoleType.Scientist,
RoleType.FacilityGuard,
};

[Description("The amount of Heal when the Target is not SCP-049-2")]
public int Heal { get; set; } = 150;

[Description("The Amount of SCP-500 that can be loaded into the VaccinePistole")]
public int MagazineSize { get; set; } = 3;

public bool Reloadable { get; set; } = true;

public ItemType UsedAmmo { get; set; } = ItemType.SCP500;
}
13 changes: 13 additions & 0 deletions MoreWeapons/Configs/XlMedkitConfig.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using Neuron.Core.Meta;
using Syml;

namespace MoreWeapons.Configs;

[Automatic]
[DocumentSection("XL Medkit")]
public class XlMedkitConfig : IDocumentSection
{
public int AmountOfUsages { get; set; } = 3;

public float HealAmount { get; set; } = 200f;
}
12 changes: 6 additions & 6 deletions MoreWeapons/CustomItemType.cs
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
namespace MoreWeapons
{
public enum CustomItemType : int
public enum CustomItemType
{
Tranquilizer = 36,
GrenadeLauncher,
ShotGun,
GrenadeLauncher = 100,
Tranquilizer,
Sniper,
Scp127,
XlMedkit,
Scp1499,
MedkitGun,
VaccinePistol,

//Coming maybe in the Future :D
//MolotovCocktail,
//MedkitGun,
//Scp275
//Scp714
//Scp1499
//Scp284
}
}
Loading