...

Chalwk77 · Jul 7, 2023 · c6743a8 · c6743a8
1 parent 00e55e5
commit c6743a8
Show file tree

Hide file tree

Showing 10 changed files with 148 additions and 141 deletions.
diff --git a/INDEV/Battle Royale/about.md b/INDEV/Battle Royale/about.md
@@ -34,7 +34,6 @@ Planned features:
 - [x] Weapon degradation: (**done**)
   - Weapons will degrade over time.
   - Weapons will have a limited number of shots before they break.
-  - Weapons will have a limited number of reloads before they break.
 - [ ] Weapons (**WIP**)
   - Players will start with no weapons. (**done**)
   - Weapons will have different stats, such as damage and degradation. (**WIP**)
@@ -53,4 +52,4 @@ Planned features:
     - `deathisland`, `gephyrophobia`
 
 # Progress:
-![alt text](https://progress-bar.dev/58/?title=Progress)
+![alt text](https://progress-bar.dev/70/?title=Progress)
diff --git a/INDEV/Battle Royale/map settings/bloodgulch.lua b/INDEV/Battle Royale/map settings/bloodgulch.lua
@@ -168,6 +168,10 @@ return {
 
 
     --- Weapon degradation (decay):
+    -- Weapons will jam over time, as they degrade.
+    -- They will progressively jam more often as they get closer to breaking.
+    -- When a weapon jams, it will not fire until it is unjammed.
+    -- The player will have to unjam the weapon by pressing the reload button.
     weapon_degradation = {
 
         -- If enabled, weapons will degrade over time.
@@ -177,17 +181,10 @@ return {
 
         decay_rate = {
 
-        -- All weapons start with a decay value of 0 and a max decay value of 100.
-        -- The lower the percentage value, the faster the weapon will degrade.
-        -- The percentage is added to the weapons decay value every 1/30th second (while firing).
-        -- Example: 1.98% = 0.066%*30 per second.
-
-            -- 2.12% every second (0.070% every 1/30th second)
-            ['weapons\\pistol\\pistol'] = 2.12,
-            ['weapons\\needler\\mp_needler'] = 2.12,
-
-            -- 2.10% every second (0.07% every 1/30th second)
-            ['weapons\\flamethrower\\flamethrower'] = 2.10,
+            -- All weapons start with a decay value of 0 and a max decay value of 100.
+            -- The higher the percentage value, the faster the weapon will degrade.
+            -- Example: 1.98% = 0.066*30% per 30 ticks.
+            -- [note]: Weapons will only decay while in use (firing, but not reloading).
 
             -- 1.20% every second (0.04% every 1/30th second)
             ['weapons\\plasma rifle\\plasma rifle'] = 1.2,
@@ -196,15 +193,22 @@ return {
             -- 1.90% every second (0.063% every 1/30th second)
             ['weapons\\shotgun\\shotgun'] = 1.90,
 
-            -- 0.45% every second (0.015% every 1/30th second)
-            ['weapons\\assault rifle\\assault rifle'] = 3.45,
+            -- 2.10% every second (0.07% every 1/30th second)
+            ['weapons\\flamethrower\\flamethrower'] = 2.10,
 
-            -- 2.45% every second (0.078% every 1/30th second)
-            ['weapons\\sniper rifle\\sniper rifle'] = 5.0,
-            ['weapons\\plasma_cannon\\plasma_cannon'] = 2.45,
+            -- 2.12% every second (0.070% every 1/30th second)
+            ['weapons\\pistol\\pistol'] = 2.12,
+            ['weapons\\needler\\mp_needler'] = 2.12,
 
             -- 2.35% every second (0.078% every 1/30th second)
             ['weapons\\rocket launcher\\rocket launcher'] = 2.35,
+
+            -- 2.45% every second (0.081% every 1/30th second)
+            ['weapons\\sniper rifle\\sniper rifle'] = 2.45,
+            ['weapons\\plasma_cannon\\plasma_cannon'] = 2.45,
+
+            -- 3.45% every second (0.115% every 1/30th second)
+            ['weapons\\assault rifle\\assault rifle'] = 3.45,
         }
     },
 

diff --git a/INDEV/Battle Royale/map settings/dangercanyon.lua b/INDEV/Battle Royale/map settings/dangercanyon.lua
@@ -184,16 +184,9 @@ return {
         decay_rate = {
 
             -- All weapons start with a decay value of 0 and a max decay value of 100.
-            -- The lower the percentage value, the faster the weapon will degrade.
-            -- The percentage is added to the weapons decay value every 1/30th second (while firing).
-            -- Example: 0.066%*30 = 1.98% per second.
-
-            -- 1.98% every second (0.066% every 1/30th second)
-            ['weapons\\pistol\\pistol'] = 1.98,
-            ['weapons\\needler\\mp_needler'] = 1.98,
-
-            -- 2.10% every second (0.07% every 1/30th second)
-            ['weapons\\flamethrower\\flamethrower'] = 2.10,
+            -- The higher the percentage value, the faster the weapon will degrade.
+            -- Example: 1.98% = 0.066*30% per 30 ticks.
+            -- [note]: Weapons will only decay while in use (firing, but not reloading).
 
             -- 1.20% every second (0.04% every 1/30th second)
             ['weapons\\plasma rifle\\plasma rifle'] = 1.2,
@@ -202,15 +195,22 @@ return {
             -- 1.90% every second (0.063% every 1/30th second)
             ['weapons\\shotgun\\shotgun'] = 1.90,
 
-            -- 2.30% every second (0.078% every 1/30th second)
-            ['weapons\\assault rifle\\assault rifle'] = 2.30,
+            -- 2.10% every second (0.07% every 1/30th second)
+            ['weapons\\flamethrower\\flamethrower'] = 2.10,
+
+            -- 2.12% every second (0.070% every 1/30th second)
+            ['weapons\\pistol\\pistol'] = 2.12,
+            ['weapons\\needler\\mp_needler'] = 2.12,
+
+            -- 2.35% every second (0.078% every 1/30th second)
+            ['weapons\\rocket launcher\\rocket launcher'] = 2.35,
 
-            -- 2.45% every second (0.078% every 1/30th second)
+            -- 2.45% every second (0.081% every 1/30th second)
             ['weapons\\sniper rifle\\sniper rifle'] = 2.45,
             ['weapons\\plasma_cannon\\plasma_cannon'] = 2.45,
 
-            -- 2.35% every second (0.078% every 1/30th second)
-            ['weapons\\rocket launcher\\rocket launcher'] = 2.35,
+            -- 3.45% every second (0.115% every 1/30th second)
+            ['weapons\\assault rifle\\assault rifle'] = 3.45,
         }
     },
 

diff --git a/INDEV/Battle Royale/map settings/deathisland.lua b/INDEV/Battle Royale/map settings/deathisland.lua
@@ -199,16 +199,9 @@ return {
         decay_rate = {
 
             -- All weapons start with a decay value of 0 and a max decay value of 100.
-            -- The lower the percentage value, the faster the weapon will degrade.
-            -- The percentage is added to the weapons decay value every 1/30th second (while firing).
-            -- Example: 0.066%*30 = 1.98% per second.
-
-            -- 1.98% every second (0.066% every 1/30th second)
-            ['weapons\\pistol\\pistol'] = 1.98,
-            ['weapons\\needler\\mp_needler'] = 1.98,
-
-            -- 2.10% every second (0.07% every 1/30th second)
-            ['weapons\\flamethrower\\flamethrower'] = 2.10,
+            -- The higher the percentage value, the faster the weapon will degrade.
+            -- Example: 1.98% = 0.066*30% per 30 ticks.
+            -- [note]: Weapons will only decay while in use (firing, but not reloading).
 
             -- 1.20% every second (0.04% every 1/30th second)
             ['weapons\\plasma rifle\\plasma rifle'] = 1.2,
@@ -217,15 +210,22 @@ return {
             -- 1.90% every second (0.063% every 1/30th second)
             ['weapons\\shotgun\\shotgun'] = 1.90,
 
-            -- 2.30% every second (0.078% every 1/30th second)
-            ['weapons\\assault rifle\\assault rifle'] = 2.30,
+            -- 2.10% every second (0.07% every 1/30th second)
+            ['weapons\\flamethrower\\flamethrower'] = 2.10,
+
+            -- 2.12% every second (0.070% every 1/30th second)
+            ['weapons\\pistol\\pistol'] = 2.12,
+            ['weapons\\needler\\mp_needler'] = 2.12,
+
+            -- 2.35% every second (0.078% every 1/30th second)
+            ['weapons\\rocket launcher\\rocket launcher'] = 2.35,
 
-            -- 2.45% every second (0.078% every 1/30th second)
+            -- 2.45% every second (0.081% every 1/30th second)
             ['weapons\\sniper rifle\\sniper rifle'] = 2.45,
             ['weapons\\plasma_cannon\\plasma_cannon'] = 2.45,
 
-            -- 2.35% every second (0.078% every 1/30th second)
-            ['weapons\\rocket launcher\\rocket launcher'] = 2.35,
+            -- 3.45% every second (0.115% every 1/30th second)
+            ['weapons\\assault rifle\\assault rifle'] = 3.45,
         }
     },
 

diff --git a/INDEV/Battle Royale/map settings/gephyrophobia.lua b/INDEV/Battle Royale/map settings/gephyrophobia.lua
@@ -194,16 +194,9 @@ return {
         decay_rate = {
 
             -- All weapons start with a decay value of 0 and a max decay value of 100.
-            -- The lower the percentage value, the faster the weapon will degrade.
-            -- The percentage is added to the weapons decay value every 1/30th second (while firing).
-            -- Example: 0.066%*30 = 1.98% per second.
-
-            -- 1.98% every second (0.066% every 1/30th second)
-            ['weapons\\pistol\\pistol'] = 1.98,
-            ['weapons\\needler\\mp_needler'] = 1.98,
-
-            -- 2.10% every second (0.07% every 1/30th second)
-            ['weapons\\flamethrower\\flamethrower'] = 2.10,
+            -- The higher the percentage value, the faster the weapon will degrade.
+            -- Example: 1.98% = 0.066*30% per 30 ticks.
+            -- [note]: Weapons will only decay while in use (firing, but not reloading).
 
             -- 1.20% every second (0.04% every 1/30th second)
             ['weapons\\plasma rifle\\plasma rifle'] = 1.2,
@@ -212,15 +205,22 @@ return {
             -- 1.90% every second (0.063% every 1/30th second)
             ['weapons\\shotgun\\shotgun'] = 1.90,
 
-            -- 2.30% every second (0.078% every 1/30th second)
-            ['weapons\\assault rifle\\assault rifle'] = 2.30,
+            -- 2.10% every second (0.07% every 1/30th second)
+            ['weapons\\flamethrower\\flamethrower'] = 2.10,
+
+            -- 2.12% every second (0.070% every 1/30th second)
+            ['weapons\\pistol\\pistol'] = 2.12,
+            ['weapons\\needler\\mp_needler'] = 2.12,
+
+            -- 2.35% every second (0.078% every 1/30th second)
+            ['weapons\\rocket launcher\\rocket launcher'] = 2.35,
 
-            -- 2.45% every second (0.078% every 1/30th second)
+            -- 2.45% every second (0.081% every 1/30th second)
             ['weapons\\sniper rifle\\sniper rifle'] = 2.45,
             ['weapons\\plasma_cannon\\plasma_cannon'] = 2.45,
 
-            -- 2.35% every second (0.078% every 1/30th second)
-            ['weapons\\rocket launcher\\rocket launcher'] = 2.35,
+            -- 3.45% every second (0.115% every 1/30th second)
+            ['weapons\\assault rifle\\assault rifle'] = 3.45,
         }
     },
 

diff --git a/INDEV/Battle Royale/map settings/icefields.lua b/INDEV/Battle Royale/map settings/icefields.lua
@@ -181,16 +181,9 @@ return {
         decay_rate = {
 
             -- All weapons start with a decay value of 0 and a max decay value of 100.
-            -- The lower the percentage value, the faster the weapon will degrade.
-            -- The percentage is added to the weapons decay value every 1/30th second (while firing).
-            -- Example: 0.066%*30 = 1.98% per second.
-
-            -- 1.98% every second (0.066% every 1/30th second)
-            ['weapons\\pistol\\pistol'] = 1.98,
-            ['weapons\\needler\\mp_needler'] = 1.98,
-
-            -- 2.10% every second (0.07% every 1/30th second)
-            ['weapons\\flamethrower\\flamethrower'] = 2.10,
+            -- The higher the percentage value, the faster the weapon will degrade.
+            -- Example: 1.98% = 0.066*30% per 30 ticks.
+            -- [note]: Weapons will only decay while in use (firing, but not reloading).
 
             -- 1.20% every second (0.04% every 1/30th second)
             ['weapons\\plasma rifle\\plasma rifle'] = 1.2,
@@ -199,15 +192,22 @@ return {
             -- 1.90% every second (0.063% every 1/30th second)
             ['weapons\\shotgun\\shotgun'] = 1.90,
 
-            -- 2.30% every second (0.078% every 1/30th second)
-            ['weapons\\assault rifle\\assault rifle'] = 2.30,
+            -- 2.10% every second (0.07% every 1/30th second)
+            ['weapons\\flamethrower\\flamethrower'] = 2.10,
+
+            -- 2.12% every second (0.070% every 1/30th second)
+            ['weapons\\pistol\\pistol'] = 2.12,
+            ['weapons\\needler\\mp_needler'] = 2.12,
+
+            -- 2.35% every second (0.078% every 1/30th second)
+            ['weapons\\rocket launcher\\rocket launcher'] = 2.35,
 
-            -- 2.45% every second (0.078% every 1/30th second)
+            -- 2.45% every second (0.081% every 1/30th second)
             ['weapons\\sniper rifle\\sniper rifle'] = 2.45,
             ['weapons\\plasma_cannon\\plasma_cannon'] = 2.45,
 
-            -- 2.35% every second (0.078% every 1/30th second)
-            ['weapons\\rocket launcher\\rocket launcher'] = 2.35,
+            -- 3.45% every second (0.115% every 1/30th second)
+            ['weapons\\assault rifle\\assault rifle'] = 3.45,
         }
     },
 

diff --git a/INDEV/Battle Royale/map settings/infinity.lua b/INDEV/Battle Royale/map settings/infinity.lua
@@ -204,16 +204,9 @@ return {
         decay_rate = {
 
             -- All weapons start with a decay value of 0 and a max decay value of 100.
-            -- The lower the percentage value, the faster the weapon will degrade.
-            -- The percentage is added to the weapons decay value every 1/30th second (while firing).
-            -- Example: 0.066%*30 = 1.98% per second.
-
-            -- 1.98% every second (0.066% every 1/30th second)
-            ['weapons\\pistol\\pistol'] = 1.98,
-            ['weapons\\needler\\mp_needler'] = 1.98,
-
-            -- 2.10% every second (0.07% every 1/30th second)
-            ['weapons\\flamethrower\\flamethrower'] = 2.10,
+            -- The higher the percentage value, the faster the weapon will degrade.
+            -- Example: 1.98% = 0.066*30% per 30 ticks.
+            -- [note]: Weapons will only decay while in use (firing, but not reloading).
 
             -- 1.20% every second (0.04% every 1/30th second)
             ['weapons\\plasma rifle\\plasma rifle'] = 1.2,
@@ -222,15 +215,22 @@ return {
             -- 1.90% every second (0.063% every 1/30th second)
             ['weapons\\shotgun\\shotgun'] = 1.90,
 
-            -- 2.30% every second (0.078% every 1/30th second)
-            ['weapons\\assault rifle\\assault rifle'] = 2.30,
+            -- 2.10% every second (0.07% every 1/30th second)
+            ['weapons\\flamethrower\\flamethrower'] = 2.10,
+
+            -- 2.12% every second (0.070% every 1/30th second)
+            ['weapons\\pistol\\pistol'] = 2.12,
+            ['weapons\\needler\\mp_needler'] = 2.12,
+
+            -- 2.35% every second (0.078% every 1/30th second)
+            ['weapons\\rocket launcher\\rocket launcher'] = 2.35,
 
-            -- 2.45% every second (0.078% every 1/30th second)
+            -- 2.45% every second (0.081% every 1/30th second)
             ['weapons\\sniper rifle\\sniper rifle'] = 2.45,
             ['weapons\\plasma_cannon\\plasma_cannon'] = 2.45,
 
-            -- 2.35% every second (0.078% every 1/30th second)
-            ['weapons\\rocket launcher\\rocket launcher'] = 2.35,
+            -- 3.45% every second (0.115% every 1/30th second)
+            ['weapons\\assault rifle\\assault rifle'] = 3.45,
         }
     },
 

diff --git a/INDEV/Battle Royale/map settings/sidewinder.lua b/INDEV/Battle Royale/map settings/sidewinder.lua
@@ -178,16 +178,9 @@ return {
         decay_rate = {
 
             -- All weapons start with a decay value of 0 and a max decay value of 100.
-            -- The lower the percentage value, the faster the weapon will degrade.
-            -- The percentage is added to the weapons decay value every 1/30th second (while firing).
-            -- Example: 0.066%*30 = 1.98% per second.
-
-            -- 1.98% every second (0.066% every 1/30th second)
-            ['weapons\\pistol\\pistol'] = 1.98,
-            ['weapons\\needler\\mp_needler'] = 1.98,
-
-            -- 2.10% every second (0.07% every 1/30th second)
-            ['weapons\\flamethrower\\flamethrower'] = 2.10,
+            -- The higher the percentage value, the faster the weapon will degrade.
+            -- Example: 1.98% = 0.066*30% per 30 ticks.
+            -- [note]: Weapons will only decay while in use (firing, but not reloading).
 
             -- 1.20% every second (0.04% every 1/30th second)
             ['weapons\\plasma rifle\\plasma rifle'] = 1.2,
@@ -196,15 +189,22 @@ return {
             -- 1.90% every second (0.063% every 1/30th second)
             ['weapons\\shotgun\\shotgun'] = 1.90,
 
-            -- 2.30% every second (0.078% every 1/30th second)
-            ['weapons\\assault rifle\\assault rifle'] = 2.30,
+            -- 2.10% every second (0.07% every 1/30th second)
+            ['weapons\\flamethrower\\flamethrower'] = 2.10,
+
+            -- 2.12% every second (0.070% every 1/30th second)
+            ['weapons\\pistol\\pistol'] = 2.12,
+            ['weapons\\needler\\mp_needler'] = 2.12,
+
+            -- 2.35% every second (0.078% every 1/30th second)
+            ['weapons\\rocket launcher\\rocket launcher'] = 2.35,
 
-            -- 2.45% every second (0.078% every 1/30th second)
+            -- 2.45% every second (0.081% every 1/30th second)
             ['weapons\\sniper rifle\\sniper rifle'] = 2.45,
             ['weapons\\plasma_cannon\\plasma_cannon'] = 2.45,
 
-            -- 2.35% every second (0.078% every 1/30th second)
-            ['weapons\\rocket launcher\\rocket launcher'] = 2.35,
+            -- 3.45% every second (0.115% every 1/30th second)
+            ['weapons\\assault rifle\\assault rifle'] = 3.45,
         }
     },