...

Chalwk77 · Jul 8, 2023 · b8da487 · b8da487
1 parent 5909779
commit b8da487
Show file tree

Hide file tree

Showing 13 changed files with 333 additions and 330 deletions.
diff --git a/INDEV/Battle Royale/about.md b/INDEV/Battle Royale/about.md
@@ -1,51 +1,53 @@
 # Battle Royale (WIP)
 
 Planned features:
+
 - [ ] Shrinking "safe zone" boundary (**WIP**)
-  - [x] The safe zone will shrink over time, forcing players to move closer together.
-  - [x] Players outside the safe zone will take damage over time.
-  - [ ] The safe zone will be marked on the map with flag poles
+    - [x] The safe zone will shrink over time, forcing players to move closer together.
+    - [x] Players outside the safe zone will take damage over time.
+    - [ ] The safe zone will be marked on the map with flag poles
 - [x] Spectator mode:
-  - [x] Players will be able to spectate other players after they die.
-  - [x] They will be invisible, invulnerable, and unable to interact with the world.
+    - [x] Players will be able to spectate other players after they die.
+    - [x] They will be invisible, invulnerable, and unable to interact with the world.
 - [x] Limited lives:
-  - [x] Players will have a limited number of lives.
-  - [x] Players will be able to spectate other players after they die.
+    - [x] Players will have a limited number of lives.
+    - [x] Players will be able to spectate other players after they die.
 - [ ] Randomized loot (**WIP**)
-  - [x] Loot will be randomized and spawn in random locations
-  - Loot includes ammo:
-    - [ ] Nuke
-    - [ ] Stun grenades
-    - [ ] Air Strike ability
-    - [x] Weapon parts (for weapon repair system)
-    - [x] Ammo (different types)
-    - [ ] Weapons (different types)
-    - [x] Grenade launcher
-    - [x] Health boost (50%, 100%, 150%, 200%)
-    - [x] Speed boost (1.2, 1.3, 1.4, 1.5)
+    - [x] Loot will be randomized and spawn in random locations
+    - Loot includes ammo:
+        - [ ] Nuke
+        - [ ] Stun grenades
+        - [ ] Air Strike ability
+        - [x] Weapon parts (for weapon repair system)
+        - [x] Ammo (different types)
+        - [ ] Weapons (different types)
+        - [x] Grenade launcher
+        - [x] Health boost (50%, 100%, 150%, 200%)
+        - [x] Speed boost (1.2, 1.3, 1.4, 1.5)
 - [x] Sky spawn system:
-  - [x] Players will spawn in the sky and fall to the ground.
-  - [x] Players will be invulnerable until they land.
-  - [x] No two players will spawn in the same location.
+    - [x] Players will spawn in the sky and fall to the ground.
+    - [x] Players will be invulnerable until they land.
+    - [x] No two players will spawn in the same location.
 - [x] Weapon weights:
-  - [x] Weapons will have weights, and players will have a weight limit.
-  - [x] Players will be able to drop weapons to reduce their weight.
+    - [x] Weapons will have weights, and players will have a weight limit.
+    - [x] Players will be able to drop weapons to reduce their weight.
 - [x] Weapon degradation:
-  - [x] Weapons will degrade over time.
-  - [x] Durability decreases when: *shooting*, *reloading* or *melee*.
+    - [x] Weapons will degrade over time.
+    - [x] Durability decreases when: *shooting*, *reloading* or *melee*.
 - [x] Weapons (general):
-  - [x] Players will start with no weapons.
-  - [x] You will have to find weapon *parts* to repair damaged weapons.
+    - [x] Players will start with no weapons.
+    - [x] You will have to find weapon *parts* to repair damaged weapons.
 - [x] Different types of ammo:
-  - [x] Armoured-piercing, 
-  - [x] Explosive
-  - [x] Golden bullets (one-shot kill)
+    - [x] Armoured-piercing,
+    - [x] Explosive
+    - [x] Golden bullets (one-shot kill)
 - [ ] Support for all stock maps: (**WIP**)
-  - It currently supports:
-    - `timberland`, `bloodgulch`,
-    - `dangercanyon`, `icefields`
-    - `infinity`, `sidewinder`
-    - `deathisland`, `gephyrophobia`
+    - It currently supports:
+        - `timberland`, `bloodgulch`,
+        - `dangercanyon`, `icefields`
+        - `infinity`, `sidewinder`
+        - `deathisland`, `gephyrophobia`
 
 # Progress:
+
 ![alt text](https://progress-bar.dev/75/?title=Progress)
diff --git a/INDEV/Battle Royale/events/on_start.lua b/INDEV/Battle Royale/events/on_start.lua
@@ -15,7 +15,7 @@ function event:loadMapSettings()
 end
 
 function event:getClipSizesTable()
-    for _,v in pairs(self.looting.spoils) do
+    for _, v in pairs(self.looting.spoils) do
         if (v.clip_sizes) then
             return v.clip_sizes
         end

diff --git a/INDEV/Battle Royale/loot/crates.lua b/INDEV/Battle Royale/loot/crates.lua
@@ -61,7 +61,7 @@ function crates:openCrate()
 
     local f = spoils._function_
     if (not self[f]) then
-        error('Unable to execute function "' .. f.. '", not found.')
+        error('Unable to execute function "' .. f .. '", not found.')
         return
     end
 

diff --git a/INDEV/Battle Royale/loot/monitor.lua b/INDEV/Battle Royale/loot/monitor.lua
@@ -22,8 +22,8 @@ function loot:monitorLoot(objects)
                 local object_meta = self:spawnObject(tag, x, y, z)
                 objects[object_meta] = v
                 objects[meta_id] = nil
-            --else
-            --    print('Respawning ' .. v.tag_class .. '/' .. v.tag_name .. ' in ' .. v.delay - v.timer:get() .. ' seconds')
+                --else
+                --    print('Respawning ' .. v.tag_class .. '/' .. v.tag_name .. ' in ' .. v.delay - v.timer:get() .. ' seconds')
             end
         end
     end

diff --git a/INDEV/Battle Royale/map settings/dangercanyon.lua b/INDEV/Battle Royale/map settings/dangercanyon.lua
@@ -92,46 +92,46 @@ return {
     sky_spawn_coordinates = {
 
         --- red base:
-        {-9.007, -4.607, -4.032, 5.632, 20},
-        {-9.007, -2.296, -4.032, 0.716, 20},
-        {-4.103, -3.552, -4.024, 3.114, 20},
-        {-6.053, -12.038, -4.124, 2.176, 20},
-        {-13.317, -6.507, -4.033, 3.635, 20},
-        {-15.207, -2.296, -4.032, 2.656, 20},
-        {-19.392, -12.193, -4.156, 1.026, 20},
+        { -9.007, -4.607, -4.032, 5.632, 20 },
+        { -9.007, -2.296, -4.032, 0.716, 20 },
+        { -4.103, -3.552, -4.024, 3.114, 20 },
+        { -6.053, -12.038, -4.124, 2.176, 20 },
+        { -13.317, -6.507, -4.033, 3.635, 20 },
+        { -15.207, -2.296, -4.032, 2.656, 20 },
+        { -19.392, -12.193, -4.156, 1.026, 20 },
 
         --- blue base:
-        {8.904, -2.296, -4.032, 2.504, 20},
-        {8.904, -4.607, -4.032, 4.212, 20},
-        {6.309, -14.432, -4.202, 0.361, 20},
-        {13.214, -6.507, -4.033, 5.651, 20},
-        {15.104, -2.296, -4.032, 0.871, 20},
-        {11.984, -3.497, -2.243, 0.043, 20},
+        { 8.904, -2.296, -4.032, 2.504, 20 },
+        { 8.904, -4.607, -4.032, 4.212, 20 },
+        { 6.309, -14.432, -4.202, 0.361, 20 },
+        { 13.214, -6.507, -4.033, 5.651, 20 },
+        { 15.104, -2.296, -4.032, 0.871, 20 },
+        { 11.984, -3.497, -2.243, 0.043, 20 },
 
         --- random locations:
-        {-40.147, -7.830, -1.147, 1.280, 20},
-        {-46.153, -4.121, -2.209, 1.337, 20},
-        {-54.402, 8.693, -5.434, 0.956, 20},
-        {-42.424, 19.730, -8.794, 1.294, 20},
-        {-57.197, 26.878, -11.470, 6.069, 20},
-        {-31.376, 30.477, -6.331, 0.720, 20},
-        {-20.903, 32.484, -6.109, 1.422, 20},
-        {-26.550, 45.467, -9.825, 6.147, 20},
-        {-18.792, 54.519, -9.228, 4.938, 20},
-        {-15.699, 38.317, -7.734, 1.795, 20},
-        {-1.257, 48.413, -8.366, 2.545, 20},
-        {1.950, 37.907, -8.366, 6.268, 20},
-        {-1.580, 42.009, -8.366, 2.690, 20},
-        {20.544, 54.181, -9.317, 5.111, 20},
-        {18.405, 37.870, -7.512, 2.327, 20},
-        {26.524, 29.264, -5.532, 1.564, 20},
-        {42.711, 34.299, -8.204, 4.881, 20},
-        {53.730, 26.437, -10.704, 3.456, 20},
-        {42.855, 20.599, -8.497, 0.180, 20},
-        {52.234, 5.204, -4.658, 2.227, 20},
-        {45.252, -4.204, -2.208, 2.114, 20},
-        {32.526, 2.839, -2.240, 4.310, 20},
-        {39.350, -7.237, -1.143, 2.406, 20},
+        { -40.147, -7.830, -1.147, 1.280, 20 },
+        { -46.153, -4.121, -2.209, 1.337, 20 },
+        { -54.402, 8.693, -5.434, 0.956, 20 },
+        { -42.424, 19.730, -8.794, 1.294, 20 },
+        { -57.197, 26.878, -11.470, 6.069, 20 },
+        { -31.376, 30.477, -6.331, 0.720, 20 },
+        { -20.903, 32.484, -6.109, 1.422, 20 },
+        { -26.550, 45.467, -9.825, 6.147, 20 },
+        { -18.792, 54.519, -9.228, 4.938, 20 },
+        { -15.699, 38.317, -7.734, 1.795, 20 },
+        { -1.257, 48.413, -8.366, 2.545, 20 },
+        { 1.950, 37.907, -8.366, 6.268, 20 },
+        { -1.580, 42.009, -8.366, 2.690, 20 },
+        { 20.544, 54.181, -9.317, 5.111, 20 },
+        { 18.405, 37.870, -7.512, 2.327, 20 },
+        { 26.524, 29.264, -5.532, 1.564, 20 },
+        { 42.711, 34.299, -8.204, 4.881, 20 },
+        { 53.730, 26.437, -10.704, 3.456, 20 },
+        { 42.855, 20.599, -8.497, 0.180, 20 },
+        { 52.234, 5.204, -4.658, 2.227, 20 },
+        { 45.252, -4.204, -2.208, 2.114, 20 },
+        { 32.526, 2.839, -2.240, 4.310, 20 },
+        { 39.350, -7.237, -1.143, 2.406, 20 },
     },
 
 

diff --git a/INDEV/Battle Royale/map settings/deathisland.lua b/INDEV/Battle Royale/map settings/deathisland.lua
@@ -92,61 +92,61 @@ return {
     sky_spawn_coordinates = {
 
         --- red base:
-        {-30.272, -2.461, 9.416, 3.938, 35},
-        {-28.694, -11.998, 9.416, 2.567, 35},
-        {-37.937, -18.749, 9.160, 2.540, 35},
-        {-38.029, -9.644, 9.416, 4.336, 35},
-        {-38.125, -4.243, 9.416, 4.071, 35},
-        {-38.600, 2.089, 10.299, 4.119, 35},
-        {-35.211, -14.059, 4.861, 2.871, 35},
+        { -30.272, -2.461, 9.416, 3.938, 35 },
+        { -28.694, -11.998, 9.416, 2.567, 35 },
+        { -37.937, -18.749, 9.160, 2.540, 35 },
+        { -38.029, -9.644, 9.416, 4.336, 35 },
+        { -38.125, -4.243, 9.416, 4.071, 35 },
+        { -38.600, 2.089, 10.299, 4.119, 35 },
+        { -35.211, -14.059, 4.861, 2.871, 35 },
 
         --- blue base:
-        {31.801, 23.153, 8.049, 5.371, 35},
-        {36.878, 10.895, 8.049, 0.491, 35},
-        {40.399, 19.095, 8.049, 1.398, 35},
-        {40.767, 13.450, 8.049, 5.033, 35},
-        {37.321, 32.209, 4.348, 5.437, 35},
-        {41.885, 15.947, 4.813, 0.043, 35},
-        {39.993, 7.351, 4.592, 0.640, 35},
+        { 31.801, 23.153, 8.049, 5.371, 35 },
+        { 36.878, 10.895, 8.049, 0.491, 35 },
+        { 40.399, 19.095, 8.049, 1.398, 35 },
+        { 40.767, 13.450, 8.049, 5.033, 35 },
+        { 37.321, 32.209, 4.348, 5.437, 35 },
+        { 41.885, 15.947, 4.813, 0.043, 35 },
+        { 39.993, 7.351, 4.592, 0.640, 35 },
 
         --- random locations:
-        {55.978, 9.804, 1.607, 4.208, 35},
-        {40.924, 45.187, 2.996, 0.598, 35},
-        {28.536, 43.808, 3.737, 2.424, 35},
-        {15.036, 53.079, 3.862, 4.173, 35},
-        {11.130, 61.929, 1.881, 0.333, 35},
-        {6.437, 57.963, 6.602, 1.758, 35},
-        {-30.108, 64.228, 3.085, 0.102, 35},
-        {-44.438, 45.171, 5.145, 2.327, 35},
-        {-57.438, 51.166, 2.886, 3.821, 35},
-        {-92.187, 10.471, 5.364, 6.005, 35},
-        {-73.362, 12.881, 1.538, 5.549, 35},
-        {-53.736, 7.222, 3.939, 3.581, 35},
-        {-46.247, 14.455, 7.926, 4.554, 35},
-        {-48.578, -23.611, 2.882, 2.799, 35},
-        {-16.357, -49.983, 1.949, 5.006, 35},
-        {-15.114, -33.192, 4.389, 5.985, 35},
-        {16.200, -35.229, 5.599, 4.503, 35},
-        {47.586, -36.576, 2.036, 5.257, 35},
-        {41.308, -17.279, 3.130, 0.569, 35},
-        {34.658, -6.568, 6.437, 5.187, 35},
-        {5.278, 8.365, 12.207, 2.264, 35},
-        {-8.524, 12.696, 13.293, 0.887, 35},
-        {-30.730, 39.630, 16.619, 4.754, 35},
-        {-33.141, 44.392, 12.614, 0.965, 35},
-        {-29.962, 42.304, 21.139, 4.813, 35},
-        {-42.326, 19.422, 22.086, 0.279, 35},
-        {-11.136, 9.218, 21.979, 0.372, 35},
-        {-24.359, -1.028, 21.278, 1.443, 35},
-        {-24.626, -19.870, 20.251, 2.008, 35},
-        {-25.565, -32.904, 19.889, 0.885, 35},
-        {7.823, -15.020, 17.045, 0.208, 35},
-        {14.597, -0.313, 20.270, 1.291, 35},
-        {20.571, -24.003, 17.676, 0.370, 35},
-        {47.432, -37.421, 13.934, 3.208, 35},
-        {27.242, 31.269, 17.936, 2.658, 35},
-        {14.220, 41.215, 16.244, 0.998, 35},
-        {-69.204, 18.944, 15.270, 5.727, 35},
+        { 55.978, 9.804, 1.607, 4.208, 35 },
+        { 40.924, 45.187, 2.996, 0.598, 35 },
+        { 28.536, 43.808, 3.737, 2.424, 35 },
+        { 15.036, 53.079, 3.862, 4.173, 35 },
+        { 11.130, 61.929, 1.881, 0.333, 35 },
+        { 6.437, 57.963, 6.602, 1.758, 35 },
+        { -30.108, 64.228, 3.085, 0.102, 35 },
+        { -44.438, 45.171, 5.145, 2.327, 35 },
+        { -57.438, 51.166, 2.886, 3.821, 35 },
+        { -92.187, 10.471, 5.364, 6.005, 35 },
+        { -73.362, 12.881, 1.538, 5.549, 35 },
+        { -53.736, 7.222, 3.939, 3.581, 35 },
+        { -46.247, 14.455, 7.926, 4.554, 35 },
+        { -48.578, -23.611, 2.882, 2.799, 35 },
+        { -16.357, -49.983, 1.949, 5.006, 35 },
+        { -15.114, -33.192, 4.389, 5.985, 35 },
+        { 16.200, -35.229, 5.599, 4.503, 35 },
+        { 47.586, -36.576, 2.036, 5.257, 35 },
+        { 41.308, -17.279, 3.130, 0.569, 35 },
+        { 34.658, -6.568, 6.437, 5.187, 35 },
+        { 5.278, 8.365, 12.207, 2.264, 35 },
+        { -8.524, 12.696, 13.293, 0.887, 35 },
+        { -30.730, 39.630, 16.619, 4.754, 35 },
+        { -33.141, 44.392, 12.614, 0.965, 35 },
+        { -29.962, 42.304, 21.139, 4.813, 35 },
+        { -42.326, 19.422, 22.086, 0.279, 35 },
+        { -11.136, 9.218, 21.979, 0.372, 35 },
+        { -24.359, -1.028, 21.278, 1.443, 35 },
+        { -24.626, -19.870, 20.251, 2.008, 35 },
+        { -25.565, -32.904, 19.889, 0.885, 35 },
+        { 7.823, -15.020, 17.045, 0.208, 35 },
+        { 14.597, -0.313, 20.270, 1.291, 35 },
+        { 20.571, -24.003, 17.676, 0.370, 35 },
+        { 47.432, -37.421, 13.934, 3.208, 35 },
+        { 27.242, 31.269, 17.936, 2.658, 35 },
+        { 14.220, 41.215, 16.244, 0.998, 35 },
+        { -69.204, 18.944, 15.270, 5.727, 35 },
     },