From fa30ebe42a5a35a92b64e1dfd930fe753fc4bb13 Mon Sep 17 00:00:00 2001 From: Chalwk77 Date: Sat, 8 Jul 2023 08:50:18 +1200 Subject: [PATCH] ... --- INDEV/Battle Royale/map settings/bloodgulch.lua | 14 +++++++++----- INDEV/Battle Royale/map settings/dangercanyon.lua | 14 +++++++++----- INDEV/Battle Royale/map settings/deathisland.lua | 14 +++++++++----- INDEV/Battle Royale/map settings/gephyrophobia.lua | 14 +++++++++----- INDEV/Battle Royale/map settings/icefields.lua | 14 +++++++++----- INDEV/Battle Royale/map settings/infinity.lua | 14 +++++++++----- INDEV/Battle Royale/map settings/sidewinder.lua | 14 +++++++++----- INDEV/Battle Royale/map settings/timberland.lua | 14 +++++++++----- .../weapon degradation/degradation.lua | 3 ++- 9 files changed, 74 insertions(+), 41 deletions(-) diff --git a/INDEV/Battle Royale/map settings/bloodgulch.lua b/INDEV/Battle Royale/map settings/bloodgulch.lua index f52b10f1..e871156b 100644 --- a/INDEV/Battle Royale/map settings/bloodgulch.lua +++ b/INDEV/Battle Royale/map settings/bloodgulch.lua @@ -195,18 +195,22 @@ return { -- Be careful not to set the decay rate too high! -- Max recommended decay rate: 50 -- Do not set values lower than 0.1 + -- + -- Durability is decremented by rate/30 when shooting and (rate/5)/30 when reloading. + -- The frequency of jamming is: (durability / 100) ^ 2 * 100 + -- decay_rate = { - ['weapons\\plasma rifle\\plasma rifle'] = 1.0, ['weapons\\plasma pistol\\plasma pistol'] = 1.0, + ['weapons\\plasma rifle\\plasma rifle'] = 1.2, - ['weapons\\assault rifle\\assault rifle'] = 3.10, + ['weapons\\assault rifle\\assault rifle'] = 1.4, ['weapons\\pistol\\pistol'] = 4.10, - ['weapons\\needler\\mp_needler'] = 4.50, + ['weapons\\needler\\mp_needler'] = 4.20, - ['weapons\\shotgun\\shotgun'] = 5.05, - ['weapons\\flamethrower\\flamethrower'] = 5.15, + ['weapons\\flamethrower\\flamethrower'] = 7.05, + ['weapons\\shotgun\\shotgun'] = 8.0, ['weapons\\sniper rifle\\sniper rifle'] = 23.0, ['weapons\\plasma_cannon\\plasma_cannon'] = 25.0, diff --git a/INDEV/Battle Royale/map settings/dangercanyon.lua b/INDEV/Battle Royale/map settings/dangercanyon.lua index e51c378d..3b776141 100644 --- a/INDEV/Battle Royale/map settings/dangercanyon.lua +++ b/INDEV/Battle Royale/map settings/dangercanyon.lua @@ -201,18 +201,22 @@ return { -- Be careful not to set the decay rate too high! -- Max recommended decay rate: 50 -- Do not set values lower than 0.1 + -- + -- Durability is decremented by rate/30 when shooting and (rate/5)/30 when reloading. + -- The frequency of jamming is: (durability / 100) ^ 2 * 100 + -- decay_rate = { - ['weapons\\plasma rifle\\plasma rifle'] = 1.0, ['weapons\\plasma pistol\\plasma pistol'] = 1.0, + ['weapons\\plasma rifle\\plasma rifle'] = 1.2, - ['weapons\\assault rifle\\assault rifle'] = 3.10, + ['weapons\\assault rifle\\assault rifle'] = 1.4, ['weapons\\pistol\\pistol'] = 4.10, - ['weapons\\needler\\mp_needler'] = 4.50, + ['weapons\\needler\\mp_needler'] = 4.20, - ['weapons\\shotgun\\shotgun'] = 5.05, - ['weapons\\flamethrower\\flamethrower'] = 5.15, + ['weapons\\flamethrower\\flamethrower'] = 7.05, + ['weapons\\shotgun\\shotgun'] = 8.0, ['weapons\\sniper rifle\\sniper rifle'] = 23.0, ['weapons\\plasma_cannon\\plasma_cannon'] = 25.0, diff --git a/INDEV/Battle Royale/map settings/deathisland.lua b/INDEV/Battle Royale/map settings/deathisland.lua index 813e3f93..6d2027dc 100644 --- a/INDEV/Battle Royale/map settings/deathisland.lua +++ b/INDEV/Battle Royale/map settings/deathisland.lua @@ -216,18 +216,22 @@ return { -- Be careful not to set the decay rate too high! -- Max recommended decay rate: 50 -- Do not set values lower than 0.1 + -- + -- Durability is decremented by rate/30 when shooting and (rate/5)/30 when reloading. + -- The frequency of jamming is: (durability / 100) ^ 2 * 100 + -- decay_rate = { - ['weapons\\plasma rifle\\plasma rifle'] = 1.0, ['weapons\\plasma pistol\\plasma pistol'] = 1.0, + ['weapons\\plasma rifle\\plasma rifle'] = 1.2, - ['weapons\\assault rifle\\assault rifle'] = 3.10, + ['weapons\\assault rifle\\assault rifle'] = 1.4, ['weapons\\pistol\\pistol'] = 4.10, - ['weapons\\needler\\mp_needler'] = 4.50, + ['weapons\\needler\\mp_needler'] = 4.20, - ['weapons\\shotgun\\shotgun'] = 5.05, - ['weapons\\flamethrower\\flamethrower'] = 5.15, + ['weapons\\flamethrower\\flamethrower'] = 7.05, + ['weapons\\shotgun\\shotgun'] = 8.0, ['weapons\\sniper rifle\\sniper rifle'] = 23.0, ['weapons\\plasma_cannon\\plasma_cannon'] = 25.0, diff --git a/INDEV/Battle Royale/map settings/gephyrophobia.lua b/INDEV/Battle Royale/map settings/gephyrophobia.lua index 4d5827af..5486d444 100644 --- a/INDEV/Battle Royale/map settings/gephyrophobia.lua +++ b/INDEV/Battle Royale/map settings/gephyrophobia.lua @@ -211,18 +211,22 @@ return { -- Be careful not to set the decay rate too high! -- Max recommended decay rate: 50 -- Do not set values lower than 0.1 + -- + -- Durability is decremented by rate/30 when shooting and (rate/5)/30 when reloading. + -- The frequency of jamming is: (durability / 100) ^ 2 * 100 + -- decay_rate = { - ['weapons\\plasma rifle\\plasma rifle'] = 1.0, ['weapons\\plasma pistol\\plasma pistol'] = 1.0, + ['weapons\\plasma rifle\\plasma rifle'] = 1.2, - ['weapons\\assault rifle\\assault rifle'] = 3.10, + ['weapons\\assault rifle\\assault rifle'] = 1.4, ['weapons\\pistol\\pistol'] = 4.10, - ['weapons\\needler\\mp_needler'] = 4.50, + ['weapons\\needler\\mp_needler'] = 4.20, - ['weapons\\shotgun\\shotgun'] = 5.05, - ['weapons\\flamethrower\\flamethrower'] = 5.15, + ['weapons\\flamethrower\\flamethrower'] = 7.05, + ['weapons\\shotgun\\shotgun'] = 8.0, ['weapons\\sniper rifle\\sniper rifle'] = 23.0, ['weapons\\plasma_cannon\\plasma_cannon'] = 25.0, diff --git a/INDEV/Battle Royale/map settings/icefields.lua b/INDEV/Battle Royale/map settings/icefields.lua index dde6cb94..c649cb76 100644 --- a/INDEV/Battle Royale/map settings/icefields.lua +++ b/INDEV/Battle Royale/map settings/icefields.lua @@ -198,18 +198,22 @@ return { -- Be careful not to set the decay rate too high! -- Max recommended decay rate: 50 -- Do not set values lower than 0.1 + -- + -- Durability is decremented by rate/30 when shooting and (rate/5)/30 when reloading. + -- The frequency of jamming is: (durability / 100) ^ 2 * 100 + -- decay_rate = { - ['weapons\\plasma rifle\\plasma rifle'] = 1.0, ['weapons\\plasma pistol\\plasma pistol'] = 1.0, + ['weapons\\plasma rifle\\plasma rifle'] = 1.2, - ['weapons\\assault rifle\\assault rifle'] = 3.10, + ['weapons\\assault rifle\\assault rifle'] = 1.4, ['weapons\\pistol\\pistol'] = 4.10, - ['weapons\\needler\\mp_needler'] = 4.50, + ['weapons\\needler\\mp_needler'] = 4.20, - ['weapons\\shotgun\\shotgun'] = 5.05, - ['weapons\\flamethrower\\flamethrower'] = 5.15, + ['weapons\\flamethrower\\flamethrower'] = 7.05, + ['weapons\\shotgun\\shotgun'] = 8.0, ['weapons\\sniper rifle\\sniper rifle'] = 23.0, ['weapons\\plasma_cannon\\plasma_cannon'] = 25.0, diff --git a/INDEV/Battle Royale/map settings/infinity.lua b/INDEV/Battle Royale/map settings/infinity.lua index 239fa62c..1e7acf01 100644 --- a/INDEV/Battle Royale/map settings/infinity.lua +++ b/INDEV/Battle Royale/map settings/infinity.lua @@ -221,18 +221,22 @@ return { -- Be careful not to set the decay rate too high! -- Max recommended decay rate: 50 -- Do not set values lower than 0.1 + -- + -- Durability is decremented by rate/30 when shooting and (rate/5)/30 when reloading. + -- The frequency of jamming is: (durability / 100) ^ 2 * 100 + -- decay_rate = { - ['weapons\\plasma rifle\\plasma rifle'] = 1.0, ['weapons\\plasma pistol\\plasma pistol'] = 1.0, + ['weapons\\plasma rifle\\plasma rifle'] = 1.2, - ['weapons\\assault rifle\\assault rifle'] = 3.10, + ['weapons\\assault rifle\\assault rifle'] = 1.4, ['weapons\\pistol\\pistol'] = 4.10, - ['weapons\\needler\\mp_needler'] = 4.50, + ['weapons\\needler\\mp_needler'] = 4.20, - ['weapons\\shotgun\\shotgun'] = 5.05, - ['weapons\\flamethrower\\flamethrower'] = 5.15, + ['weapons\\flamethrower\\flamethrower'] = 7.05, + ['weapons\\shotgun\\shotgun'] = 8.0, ['weapons\\sniper rifle\\sniper rifle'] = 23.0, ['weapons\\plasma_cannon\\plasma_cannon'] = 25.0, diff --git a/INDEV/Battle Royale/map settings/sidewinder.lua b/INDEV/Battle Royale/map settings/sidewinder.lua index 1bf59344..0f3d9f2b 100644 --- a/INDEV/Battle Royale/map settings/sidewinder.lua +++ b/INDEV/Battle Royale/map settings/sidewinder.lua @@ -195,18 +195,22 @@ return { -- Be careful not to set the decay rate too high! -- Max recommended decay rate: 50 -- Do not set values lower than 0.1 + -- + -- Durability is decremented by rate/30 when shooting and (rate/5)/30 when reloading. + -- The frequency of jamming is: (durability / 100) ^ 2 * 100 + -- decay_rate = { - ['weapons\\plasma rifle\\plasma rifle'] = 1.0, ['weapons\\plasma pistol\\plasma pistol'] = 1.0, + ['weapons\\plasma rifle\\plasma rifle'] = 1.2, - ['weapons\\assault rifle\\assault rifle'] = 3.10, + ['weapons\\assault rifle\\assault rifle'] = 1.4, ['weapons\\pistol\\pistol'] = 4.10, - ['weapons\\needler\\mp_needler'] = 4.50, + ['weapons\\needler\\mp_needler'] = 4.20, - ['weapons\\shotgun\\shotgun'] = 5.05, - ['weapons\\flamethrower\\flamethrower'] = 5.15, + ['weapons\\flamethrower\\flamethrower'] = 7.05, + ['weapons\\shotgun\\shotgun'] = 8.0, ['weapons\\sniper rifle\\sniper rifle'] = 23.0, ['weapons\\plasma_cannon\\plasma_cannon'] = 25.0, diff --git a/INDEV/Battle Royale/map settings/timberland.lua b/INDEV/Battle Royale/map settings/timberland.lua index 3e8f1d6b..3787109c 100644 --- a/INDEV/Battle Royale/map settings/timberland.lua +++ b/INDEV/Battle Royale/map settings/timberland.lua @@ -200,18 +200,22 @@ return { -- Be careful not to set the decay rate too high! -- Max recommended decay rate: 50 -- Do not set values lower than 0.1 + -- + -- Durability is decremented by rate/30 when shooting and (rate/5)/30 when reloading. + -- The frequency of jamming is: (durability / 100) ^ 2 * 100 + -- decay_rate = { - ['weapons\\plasma rifle\\plasma rifle'] = 1.0, ['weapons\\plasma pistol\\plasma pistol'] = 1.0, + ['weapons\\plasma rifle\\plasma rifle'] = 1.2, - ['weapons\\assault rifle\\assault rifle'] = 3.10, + ['weapons\\assault rifle\\assault rifle'] = 1.4, ['weapons\\pistol\\pistol'] = 4.10, - ['weapons\\needler\\mp_needler'] = 4.50, + ['weapons\\needler\\mp_needler'] = 4.20, - ['weapons\\shotgun\\shotgun'] = 5.05, - ['weapons\\flamethrower\\flamethrower'] = 5.15, + ['weapons\\flamethrower\\flamethrower'] = 7.05, + ['weapons\\shotgun\\shotgun'] = 8.0, ['weapons\\sniper rifle\\sniper rifle'] = 23.0, ['weapons\\plasma_cannon\\plasma_cannon'] = 25.0, diff --git a/INDEV/Battle Royale/weapon degradation/degradation.lua b/INDEV/Battle Royale/weapon degradation/degradation.lua index 6b2f91fb..be16390a 100644 --- a/INDEV/Battle Royale/weapon degradation/degradation.lua +++ b/INDEV/Battle Royale/weapon degradation/degradation.lua @@ -64,7 +64,7 @@ local function checkDurability(weapon, rate, reload) local time = weapon.timer:get() local durability = weapon.durability - local frequency = (durability / 100) * (durability / 100) * 100 + local frequency = (durability / 100) ^ 2 * 100 cprint('Jam when: ' .. time .. ' / ' .. frequency) @@ -107,6 +107,7 @@ function weapons:degrade() return elseif (object == 0) then self.decay[object] = nil + return end self:addWeapon(object, weapon)