From 7f9eaab7b02b73c3cea7fcbf4cd77487f55900cf Mon Sep 17 00:00:00 2001 From: Gamingtoday093 <70017362+Gamingtoday093@users.noreply.github.com> Date: Sun, 10 Oct 2021 14:18:20 +0200 Subject: [PATCH 1/2] Added Gun Modifier --- XPForKills.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/XPForKills.cs b/XPForKills.cs index ddd9013..7e0885e 100644 --- a/XPForKills.cs +++ b/XPForKills.cs @@ -6,6 +6,7 @@ using Rocket.Core.Plugins; using Rocket.Core.Logging; using SDG.Unturned; +using XPForKills; namespace PhaserArray.XPForKills { @@ -97,11 +98,13 @@ public void OnPlayerDeath(UnturnedPlayer player, EDeathCause deathCause, ELimb l private void KillReward(UnturnedPlayer murderer, UnturnedPlayer victim, ELimb limb) { var limbModifier = GetLimbModifier(limb); - var killReward = (int)(Config.KillXP * limbModifier); - + var getGunModifier = Config.GunMultipliers.FirstOrDefault(m => m.Id == murderer.Player.equipment.asset.id); + if (getGunModifier == null) getGunModifier = 1f; + var killReward = (int)(Config.KillXP * limbModifier * getGunModifier); + if (killReward == 0) return; var realXPDelta = ChangeExperience(murderer, killReward); - + if (!Config.DisableMessages) return; UnturnedChat.Say(murderer, Instance.Translate("experience_kill_reward", victim.CharacterName, realXPDelta)); } From 67a7aeea157cd659fb51d624cc0f368de160a9ff Mon Sep 17 00:00:00 2001 From: Gamingtoday093 <70017362+Gamingtoday093@users.noreply.github.com> Date: Sun, 10 Oct 2021 14:26:17 +0200 Subject: [PATCH 2/2] Messed up Accidentally Messed up and forgot that the getGunModifier returns a GunModifierModel and not the float modifier itself --- XPForKills.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/XPForKills.cs b/XPForKills.cs index 7e0885e..a46fdee 100644 --- a/XPForKills.cs +++ b/XPForKills.cs @@ -99,8 +99,9 @@ private void KillReward(UnturnedPlayer murderer, UnturnedPlayer victim, ELimb li { var limbModifier = GetLimbModifier(limb); var getGunModifier = Config.GunMultipliers.FirstOrDefault(m => m.Id == murderer.Player.equipment.asset.id); - if (getGunModifier == null) getGunModifier = 1f; - var killReward = (int)(Config.KillXP * limbModifier * getGunModifier); + float GunModifier = 1f; + if (getGunModifier != null) GunModifier = getGunModifier.Multiplier; + var killReward = (int)(Config.KillXP * limbModifier * GunModifier); if (killReward == 0) return; var realXPDelta = ChangeExperience(murderer, killReward);