From 2d2af92e517ffffaa7ff0da8fe9dce7dad99608e Mon Sep 17 00:00:00 2001 From: Vespura <31419184+TomGrobbe@users.noreply.github.com> Date: Sun, 3 Jun 2018 21:08:55 +0200 Subject: [PATCH] VA+PM: Sort all weapons A-Z and add SNS mk2 --- vMenu/PermissionsManager.cs | 135 +++++++++--------- vMenu/ValidWeapon.cs | 271 ++++++++++++++++++------------------ 2 files changed, 205 insertions(+), 201 deletions(-) diff --git a/vMenu/PermissionsManager.cs b/vMenu/PermissionsManager.cs index 0bc66469..e3134ff8 100644 --- a/vMenu/PermissionsManager.cs +++ b/vMenu/PermissionsManager.cs @@ -139,88 +139,89 @@ public enum Permission WPSetAllAmmo, //Weapons Permissions - WPSniperRifle, - WPFireExtinguisher, - WPCompactGrenadeLauncher, - WPSnowball, - WPVintagePistol, - WPCombatPDW, - WPHeavySniperMk2, - WPHeavySniper, - WPSweeperShotgun, - WPMicroSMG, - WPWrench, - WPPistol, - WPPumpShotgun, WPAPPistol, - WPBall, - WPMolotov, - WPSMG, - WPStickyBomb, - WPPetrolCan, - WPStunGun, + WPAdvancedRifle, + WPAssaultRifle, WPAssaultRifleMk2, - WPHeavyShotgun, - WPMinigun, - WPGolfClub, - WPFlareGun, - WPFlare, - WPGrenadeLauncherSmoke, - WPHammer, - WPCombatPistol, - WPGusenberg, - WPCompactRifle, - WPHomingLauncher, - WPNightstick, - WPRailgun, - WPSawnOffShotgun, - WPSMGMk2, + WPAssaultSMG, + WPAssaultShotgun, + WPBZGas, + WPBall, + WPBat, + WPBattleAxe, + WPBottle, WPBullpupRifle, - WPFirework, - WPCombatMG, + WPBullpupShotgun, WPCarbineRifle, + WPCarbineRifleMk2, + WPCombatMG, + WPCombatMGMk2, + WPCombatPDW, + WPCombatPistol, + WPCompactGrenadeLauncher, + WPCompactRifle, WPCrowbar, - WPFlashlight, WPDagger, + WPDoubleBarrelShotgun, + WPFireExtinguisher, + WPFirework, + WPFlare, + WPFlareGun, + WPFlashlight, + WPGolfClub, WPGrenade, - WPPoolCue, - WPBat, - WPPistol50, + WPGrenadeLauncher, + WPGrenadeLauncherSmoke, + WPGusenberg, + WPHammer, + WPHatchet, + WPHeavyPistol, + WPHeavyShotgun, + WPHeavySniper, + WPHeavySniperMk2, + WPHomingLauncher, WPKnife, + WPKnuckleDuster, WPMG, - WPBullpupShotgun, - WPBZGas, - WPUnarmed, - WPGrenadeLauncher, - WPNightVision, + WPMachete, + WPMachinePistol, + WPMarksmanPistol, + WPMarksmanRifle, + WPMicroSMG, + WPMiniSMG, + WPMinigun, + WPMolotov, WPMusket, + WPNightVision, + WPNightstick, + WPParachute, + WPPetrolCan, + WPPipeBomb, + WPPistol, + WPPistol50, + WPPistolMk2, + WPPoolCue, WPProximityMine, - WPAdvancedRifle, + WPPumpShotgun, WPRPG, - WPPipeBomb, - WPMiniSMG, + WPRailgun, + WPRevolver, + WPSMG, + WPSMGMk2, WPSNSPistol, - WPPistolMk2, - WPAssaultRifle, + WPSNSPistolMk2, + WPSawnOffShotgun, + WPSmokeGrenade, + WPSniperRifle, + WPSnowball, WPSpecialCarbine, - WPRevolver, - WPMarksmanRifle, - WPBattleAxe, - WPHeavyPistol, - WPKnuckleDuster, - WPMachinePistol, - WPCombatMGMk2, - WPMarksmanPistol, - WPMachete, + WPStickyBomb, + WPStunGun, + WPSweeperShotgun, WPSwitchBlade, - WPAssaultShotgun, - WPDoubleBarrelShotgun, - WPAssaultSMG, - WPHatchet, - WPBottle, - WPCarbineRifleMk2, - WPParachute, - WPSmokeGrenade, + WPUnarmed, + WPVintagePistol, + WPWrench, // Misc Settings //MSMenu, (removed because this menu should always be allowed). diff --git a/vMenu/ValidWeapon.cs b/vMenu/ValidWeapon.cs index c44dbc34..9c3ce7f0 100644 --- a/vMenu/ValidWeapon.cs +++ b/vMenu/ValidWeapon.cs @@ -65,174 +65,176 @@ public ValidWeapons() #region Weapon names, hashes and localized names (+ all components & tints). public static Dictionary weaponNames = new Dictionary() { - ["SniperRifle"] = "Sniper Rifle", - ["FireExtinguisher"] = "Fire Extinguisher", - ["CompactGrenadeLauncher"] = "Compact Grenade Launcher", - ["Snowball"] = "Snowball", - ["VintagePistol"] = "Vintage Pistol", - ["CombatPDW"] = "Combat PDW", - ["HeavySniperMk2"] = "Heavy Sniper Mk II", - ["HeavySniper"] = "Heavy Sniper", - ["SweeperShotgun"] = "Sweeper Shotgun", - ["MicroSMG"] = "Micro SMG", - ["Wrench"] = "Pipe Wrench", - ["Pistol"] = "Pistol", - ["PumpShotgun"] = "Pump Shotgun", ["APPistol"] = "AP Pistol", - ["Ball"] = "Ball", - ["Molotov"] = "Molotov", - ["SMG"] = "SMG", - ["StickyBomb"] = "Sticky Bomb", - ["PetrolCan"] = "Jerry Can", - ["StunGun"] = "Stun Gun", + ["AdvancedRifle"] = "Advanced Rifle", + ["AssaultRifle"] = "Assault Rifle", ["AssaultRifleMk2"] = "Assault Rifle Mk II", - ["HeavyShotgun"] = "Heavy Shotgun", - ["Minigun"] = "Minigun", - ["GolfClub"] = "Golf Club", - ["FlareGun"] = "Flare Gun", - ["Flare"] = "Flare", - ["GrenadeLauncherSmoke"] = "Invalid", - ["Hammer"] = "Hammer", - ["CombatPistol"] = "Combat Pistol", - ["Gusenberg"] = "Gusenberg Sweeper", - ["CompactRifle"] = "Compact Rifle", - ["HomingLauncher"] = "Homing Launcher", - ["Nightstick"] = "Nightstick", - ["Railgun"] = "Railgun", - ["SawnOffShotgun"] = "Sawed-Off Shotgun", - ["SMGMk2"] = "SMG Mk II", + ["AssaultSMG"] = "Assault SMG", + ["AssaultShotgun"] = "Assault Shotgun", + ["BZGas"] = "BZ Gas", + ["Ball"] = "Ball", + ["Bat"] = "Baseball Bat", + ["BattleAxe"] = "Battle Axe", + ["Bottle"] = "Bottle", ["BullpupRifle"] = "Bullpup Rifle", - ["Firework"] = "Firework Launcher", - ["CombatMG"] = "Combat MG", + ["BullpupShotgun"] = "Bullpup Shotgun", ["CarbineRifle"] = "Carbine Rifle", + ["CarbineRifleMk2"] = "Carbine Rifle Mk II", + ["CombatMG"] = "Combat MG", + ["CombatMGMk2"] = "Combat MG Mk II", + ["CombatPDW"] = "Combat PDW", + ["CombatPistol"] = "Combat Pistol", + ["CompactGrenadeLauncher"] = "Compact Grenade Launcher", + ["CompactRifle"] = "Compact Rifle", ["Crowbar"] = "Crowbar", - ["Flashlight"] = "Flashlight", ["Dagger"] = "Antique Cavalry Dagger", + ["DoubleBarrelShotgun"] = "Double Barrel Shotgun", + ["FireExtinguisher"] = "Fire Extinguisher", + ["Firework"] = "Firework Launcher", + ["Flare"] = "Flare", + ["FlareGun"] = "Flare Gun", + ["Flashlight"] = "Flashlight", + ["GolfClub"] = "Golf Club", ["Grenade"] = "Grenade", - ["PoolCue"] = "Pool Cue", - ["Bat"] = "Baseball Bat", - ["Pistol50"] = "Pistol .50", + ["GrenadeLauncher"] = "Grenade Launcher", + ["GrenadeLauncherSmoke"] = "Invalid", + ["Gusenberg"] = "Gusenberg Sweeper", + ["Hammer"] = "Hammer", + ["Hatchet"] = "Hatchet", + ["HeavyPistol"] = "Heavy Pistol", + ["HeavyShotgun"] = "Heavy Shotgun", + ["HeavySniper"] = "Heavy Sniper", + ["HeavySniperMk2"] = "Heavy Sniper Mk II", + ["HomingLauncher"] = "Homing Launcher", ["Knife"] = "Knife", + ["KnuckleDuster"] = "Knuckle Duster", ["MG"] = "MG", - ["BullpupShotgun"] = "Bullpup Shotgun", - ["BZGas"] = "BZ Gas", - ["Unarmed"] = "Unarmed", - ["GrenadeLauncher"] = "Grenade Launcher", - ["NightVision"] = "Night Vision", + ["Machete"] = "Machete", + ["MachinePistol"] = "Machine Pistol", + ["MarksmanPistol"] = "Marksman Pistol", + ["MarksmanRifle"] = "Marksman Rifle", + ["MicroSMG"] = "Micro SMG", + ["MiniSMG"] = "Mini SMG", + ["Minigun"] = "Minigun", + ["Molotov"] = "Molotov", ["Musket"] = "Musket", + ["NightVision"] = "Night Vision", + ["Nightstick"] = "Nightstick", + ["Parachute"] = "Parachute", + ["PetrolCan"] = "Jerry Can", + ["PipeBomb"] = "Pipe Bomb", + ["Pistol"] = "Pistol", + ["Pistol50"] = "Pistol .50", + ["PistolMk2"] = "Pistol Mk II", + ["PoolCue"] = "Pool Cue", ["ProximityMine"] = "Proximity Mine", - ["AdvancedRifle"] = "Advanced Rifle", + ["PumpShotgun"] = "Pump Shotgun", ["RPG"] = "RPG", - ["PipeBomb"] = "Pipe Bomb", - ["MiniSMG"] = "Mini SMG", + ["Railgun"] = "Railgun", + ["Revolver"] = "Heavy Revolver", + ["SMG"] = "SMG", + ["SMGMk2"] = "SMG Mk II", + ["SniperRifle"] = "Sniper Rifle", ["SNSPistol"] = "SNS Pistol", - ["PistolMk2"] = "Pistol Mk II", - ["AssaultRifle"] = "Assault Rifle", + ["SNSPistolMk2"] = "SNS Pistol Mk II", + ["SawnOffShotgun"] = "Sawed-Off Shotgun", + ["SmokeGrenade"] = "Tear Gas", + ["Snowball"] = "Snowball", ["SpecialCarbine"] = "Special Carbine", - ["Revolver"] = "Heavy Revolver", - ["MarksmanRifle"] = "Marksman Rifle", - ["BattleAxe"] = "Battle Axe", - ["HeavyPistol"] = "Heavy Pistol", - ["KnuckleDuster"] = "Knuckle Duster", - ["MachinePistol"] = "Machine Pistol", - ["CombatMGMk2"] = "Combat MG Mk II", - ["MarksmanPistol"] = "Marksman Pistol", - ["Machete"] = "Machete", + ["StickyBomb"] = "Sticky Bomb", + ["StunGun"] = "Stun Gun", + ["SweeperShotgun"] = "Sweeper Shotgun", ["SwitchBlade"] = "Switchblade", - ["AssaultShotgun"] = "Assault Shotgun", - ["DoubleBarrelShotgun"] = "Double Barrel Shotgun", - ["AssaultSMG"] = "Assault SMG", - ["Hatchet"] = "Hatchet", - ["Bottle"] = "Bottle", - ["CarbineRifleMk2"] = "Carbine Rifle Mk II", - ["Parachute"] = "Parachute", - ["SmokeGrenade"] = "Tear Gas", + ["Unarmed"] = "Unarmed", + ["VintagePistol"] = "Vintage Pistol", + ["Wrench"] = "Pipe Wrench", }; public static Dictionary weaponPermissions = new Dictionary() { - ["SniperRifle"] = Permission.WPSniperRifle, - ["FireExtinguisher"] = Permission.WPFireExtinguisher, - ["CompactGrenadeLauncher"] = Permission.WPCompactGrenadeLauncher, - ["Snowball"] = Permission.WPSnowball, - ["VintagePistol"] = Permission.WPVintagePistol, - ["CombatPDW"] = Permission.WPCombatPDW, - ["HeavySniperMk2"] = Permission.WPHeavySniperMk2, - ["HeavySniper"] = Permission.WPHeavySniper, - ["SweeperShotgun"] = Permission.WPSweeperShotgun, - ["MicroSMG"] = Permission.WPMicroSMG, - ["Wrench"] = Permission.WPWrench, - ["Pistol"] = Permission.WPPistol, - ["PumpShotgun"] = Permission.WPPumpShotgun, ["APPistol"] = Permission.WPAPPistol, - ["Ball"] = Permission.WPBall, - ["Molotov"] = Permission.WPMolotov, - ["SMG"] = Permission.WPSMG, - ["StickyBomb"] = Permission.WPStickyBomb, - ["PetrolCan"] = Permission.WPPetrolCan, - ["StunGun"] = Permission.WPStunGun, + ["AdvancedRifle"] = Permission.WPAdvancedRifle, + ["AssaultRifle"] = Permission.WPAssaultRifle, ["AssaultRifleMk2"] = Permission.WPAssaultRifleMk2, - ["HeavyShotgun"] = Permission.WPHeavyShotgun, - ["Minigun"] = Permission.WPMinigun, - ["GolfClub"] = Permission.WPGolfClub, - ["FlareGun"] = Permission.WPFlareGun, - ["Flare"] = Permission.WPFlare, - ["GrenadeLauncherSmoke"] = Permission.WPGrenadeLauncherSmoke, - ["Hammer"] = Permission.WPHammer, - ["CombatPistol"] = Permission.WPCombatPistol, - ["Gusenberg"] = Permission.WPGusenberg, - ["CompactRifle"] = Permission.WPCompactRifle, - ["HomingLauncher"] = Permission.WPHomingLauncher, - ["Nightstick"] = Permission.WPNightstick, - ["Railgun"] = Permission.WPRailgun, - ["SawnOffShotgun"] = Permission.WPSawnOffShotgun, - ["SMGMk2"] = Permission.WPSMGMk2, + ["AssaultSMG"] = Permission.WPAssaultSMG, + ["AssaultShotgun"] = Permission.WPAssaultShotgun, + ["BZGas"] = Permission.WPBZGas, + ["Ball"] = Permission.WPBall, + ["Bat"] = Permission.WPBat, + ["BattleAxe"] = Permission.WPBattleAxe, + ["Bottle"] = Permission.WPBottle, ["BullpupRifle"] = Permission.WPBullpupRifle, - ["Firework"] = Permission.WPFirework, - ["CombatMG"] = Permission.WPCombatMG, + ["BullpupShotgun"] = Permission.WPBullpupShotgun, ["CarbineRifle"] = Permission.WPCarbineRifle, + ["CarbineRifleMk2"] = Permission.WPCarbineRifleMk2, + ["CombatMG"] = Permission.WPCombatMG, + ["CombatMGMk2"] = Permission.WPCombatMGMk2, + ["CombatPDW"] = Permission.WPCombatPDW, + ["CombatPistol"] = Permission.WPCombatPistol, + ["CompactGrenadeLauncher"] = Permission.WPCompactGrenadeLauncher, + ["CompactRifle"] = Permission.WPCompactRifle, ["Crowbar"] = Permission.WPCrowbar, - ["Flashlight"] = Permission.WPFlashlight, ["Dagger"] = Permission.WPDagger, + ["DoubleBarrelShotgun"] = Permission.WPDoubleBarrelShotgun, + ["FireExtinguisher"] = Permission.WPFireExtinguisher, + ["Firework"] = Permission.WPFirework, + ["Flare"] = Permission.WPFlare, + ["FlareGun"] = Permission.WPFlareGun, + ["Flashlight"] = Permission.WPFlashlight, + ["GolfClub"] = Permission.WPGolfClub, ["Grenade"] = Permission.WPGrenade, - ["PoolCue"] = Permission.WPPoolCue, - ["Bat"] = Permission.WPBat, - ["Pistol50"] = Permission.WPPistol50, + ["GrenadeLauncher"] = Permission.WPGrenadeLauncher, + ["GrenadeLauncherSmoke"] = Permission.WPGrenadeLauncherSmoke, + ["Gusenberg"] = Permission.WPGusenberg, + ["Hammer"] = Permission.WPHammer, + ["Hatchet"] = Permission.WPHatchet, + ["HeavyPistol"] = Permission.WPHeavyPistol, + ["HeavyShotgun"] = Permission.WPHeavyShotgun, + ["HeavySniper"] = Permission.WPHeavySniper, + ["HeavySniperMk2"] = Permission.WPHeavySniperMk2, + ["HomingLauncher"] = Permission.WPHomingLauncher, ["Knife"] = Permission.WPKnife, + ["KnuckleDuster"] = Permission.WPKnuckleDuster, ["MG"] = Permission.WPMG, - ["BullpupShotgun"] = Permission.WPBullpupShotgun, - ["BZGas"] = Permission.WPBZGas, - ["Unarmed"] = Permission.WPUnarmed, - ["GrenadeLauncher"] = Permission.WPGrenadeLauncher, - ["NightVision"] = Permission.WPNightVision, + ["Machete"] = Permission.WPMachete, + ["MachinePistol"] = Permission.WPMachinePistol, + ["MarksmanPistol"] = Permission.WPMarksmanPistol, + ["MarksmanRifle"] = Permission.WPMarksmanRifle, + ["MicroSMG"] = Permission.WPMicroSMG, + ["MiniSMG"] = Permission.WPMiniSMG, + ["Minigun"] = Permission.WPMinigun, + ["Molotov"] = Permission.WPMolotov, ["Musket"] = Permission.WPMusket, + ["NightVision"] = Permission.WPNightVision, + ["Nightstick"] = Permission.WPNightstick, + ["Parachute"] = Permission.WPParachute, + ["PetrolCan"] = Permission.WPPetrolCan, + ["PipeBomb"] = Permission.WPPipeBomb, + ["Pistol"] = Permission.WPPistol, + ["Pistol50"] = Permission.WPPistol50, + ["PistolMk2"] = Permission.WPPistolMk2, + ["PoolCue"] = Permission.WPPoolCue, ["ProximityMine"] = Permission.WPProximityMine, - ["AdvancedRifle"] = Permission.WPAdvancedRifle, + ["PumpShotgun"] = Permission.WPPumpShotgun, ["RPG"] = Permission.WPRPG, - ["PipeBomb"] = Permission.WPPipeBomb, - ["MiniSMG"] = Permission.WPMiniSMG, + ["Railgun"] = Permission.WPRailgun, + ["Revolver"] = Permission.WPRevolver, + ["SMG"] = Permission.WPSMG, + ["SMGMk2"] = Permission.WPSMGMk2, ["SNSPistol"] = Permission.WPSNSPistol, - ["PistolMk2"] = Permission.WPPistolMk2, - ["AssaultRifle"] = Permission.WPAssaultRifle, + ["SNSPistolMk2"] = Permission.WPSNSPistolMk2, + ["SawnOffShotgun"] = Permission.WPSawnOffShotgun, + ["SmokeGrenade"] = Permission.WPSmokeGrenade, + ["SniperRifle"] = Permission.WPSniperRifle, + ["Snowball"] = Permission.WPSnowball, ["SpecialCarbine"] = Permission.WPSpecialCarbine, - ["Revolver"] = Permission.WPRevolver, - ["MarksmanRifle"] = Permission.WPMarksmanRifle, - ["BattleAxe"] = Permission.WPBattleAxe, - ["HeavyPistol"] = Permission.WPHeavyPistol, - ["KnuckleDuster"] = Permission.WPKnuckleDuster, - ["MachinePistol"] = Permission.WPMachinePistol, - ["CombatMGMk2"] = Permission.WPCombatMGMk2, - ["MarksmanPistol"] = Permission.WPMarksmanPistol, - ["Machete"] = Permission.WPMachete, + ["StickyBomb"] = Permission.WPStickyBomb, + ["StunGun"] = Permission.WPStunGun, + ["SweeperShotgun"] = Permission.WPSweeperShotgun, ["SwitchBlade"] = Permission.WPSwitchBlade, - ["AssaultShotgun"] = Permission.WPAssaultShotgun, - ["DoubleBarrelShotgun"] = Permission.WPDoubleBarrelShotgun, - ["AssaultSMG"] = Permission.WPAssaultSMG, - ["Hatchet"] = Permission.WPHatchet, - ["Bottle"] = Permission.WPBottle, - ["CarbineRifleMk2"] = Permission.WPCarbineRifleMk2, - ["Parachute"] = Permission.WPParachute, - ["SmokeGrenade"] = Permission.WPSmokeGrenade, + ["Unarmed"] = Permission.WPUnarmed, + ["VintagePistol"] = Permission.WPVintagePistol, + ["Wrench"] = Permission.WPWrench, }; /// @@ -314,6 +316,7 @@ public ValidWeapons() ["SniperRifle"] = 100416529, ["Snowball"] = 126349499, ["SNSPistol"] = 3218215474, + ["SNSPistolMk2"] = 2009644972, ["SpecialCarbine"] = 3231910285, ["StickyBomb"] = 741814745, ["StunGun"] = 911657153,