diff --git a/ReallifeGamemode.Client/util/weapondamage.ts b/ReallifeGamemode.Client/util/weapondamage.ts index ef4f20c9..2968ed23 100644 --- a/ReallifeGamemode.Client/util/weapondamage.ts +++ b/ReallifeGamemode.Client/util/weapondamage.ts @@ -2,8 +2,8 @@ mp.events.add('SERVER:WeaponModifier', (player) => { //mp.gui.chat.push("Modifier steht jetzt auf" + modifier); //mp.players.local.setWeaponDamageModifier(modifier); - let modifier = 1; - let meelemodifier = 1; + modifier = 1; + meelemodifier = 1; switch (player.weapon) { case 0x1B06D571: //Pistol @@ -39,6 +39,10 @@ modifier = 0.2; meelemodifier = 1; break; + case 0x05FC3C11: //Sniperrifle + modifier = 0.5; + meelemodifier = 1; + break; case 0xA2719263: //Meele Umarmed Fist meelemodifier = 0.1; modifier = 1; @@ -70,6 +74,13 @@ mp.game.invoke("0x4A3DC7ECCC321032", player, meelemodifier); mp.gui.chat.push("Modifier: " + modifier + "MeeleModifier: " +meelemodifier); }); + mp.events.add('SERVER:WeaponModifier2', (player, modifier, meelemodifier) => { + //mp.gui.chat.push("Modifier steht jetzt auf" + modifier); + //mp.players.local.setWeaponDamageModifier(modifier); + mp.game.invoke("0xCE07B9F7817AADA3", player, modifier); + mp.game.invoke("0x4A3DC7ECCC321032", player, meelemodifier); + mp.gui.chat.push("Modifier: " + modifier + "MeeleModifier: " + meelemodifier); + }); /*mp.events.add('playerWeaponShot', (targetPosition, targetEntity) => { for (var x in this.weaponAmmo) { if (this.weaponAmmo[x].id != this.currentWeapon) { diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index fec4cd0a..839aec77 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -1606,13 +1606,13 @@ namespace ReallifeGamemode.Server.Commands public void CmdWeaponModifier(Player player, float modifier) { player.SendChatMessage("Modifier steht auf" + modifier); - player.TriggerEvent("WeaponModifier", player, modifier); + player.TriggerEvent("SERVER:WeaponModifier2", player, modifier, 1); } [Command("wepmmod", "~m~Benutzung: ~s~/wepmmod [Variable]")] public void CmdWeaponMeeleModifier(Player player, float modifier) { player.SendChatMessage("MeeleModifier steht auf" + modifier); - player.TriggerEvent("WeaponMeeleModifier", player, modifier); + player.TriggerEvent("SERVER:WeaponModifier2", player, 1, modifier); } [Command("gotocp", "~m~Benutzung: ~s~/gotocp")] public void CmdAdminGotocp(Player admin)