.

Chalwk77 · Jul 11, 2023 · 83a4f94 · 83a4f94
1 parent 785333f
commit 83a4f94
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 49 deletions.
diff --git a/INDEV/Battle Royale/about.md b/INDEV/Battle Royale/about.md
@@ -73,6 +73,7 @@ Loot crates will spawn randomly around the map, containing weapons, ammo, and ot
 - Game doesn't end with the last man standing
 - ~~Time remaining HUD keeps resetting when the zone shrinks.~~
 - ~~Nuke is crashing the server.~~
+- Players are given too many golden bullets (based on weapon clip size). Needs to be limited to 3 max?
 - When receiving an overshield from a loot crate, you won't see the shield bar change until you take damage.<br/>
   Unfortunately, this is a limitation of Halo's net code.
 

diff --git a/INDEV/Battle Royale/map settings/custom/portent.lua b/INDEV/Battle Royale/map settings/custom/portent.lua
@@ -8,9 +8,9 @@ return {
     -- [note]: 1 world unit is 10 feet or ~3.048 meters.
     --
     safe_zone = {
-        x = 0,
-        y = 0,
-        z = 0,
+        x = 0.165,
+        y = -0.032,
+        z = 0.650,
         min = 6, -- default (6 world/units)
         max = 206 -- default (206 world/units)
     },
@@ -91,10 +91,32 @@ return {
     sky_spawn_coordinates = {
 
         --- red base:
+        {47.826, 20.071, -3.807, 2.537, 35},
+        {46.060, 14.201, -3.886, 3.303, 35},
+        {23.837, 9.859, -4.650, 0.413, 35},
+        {20.294, 15.857, -4.650, 0.495, 35},
+        {49.895, 15.770, -1.127, 2.894, 35},
 
         --- blue base:
+        {-46.961, 19.766, -3.899, 0.493, 35},
+        {-45.938, 13.916, -3.864, 6.164, 35},
+        {-23.760, 9.668, -4.650, 2.602, 35},
+        {-20.683, 15.951, -4.650, 2.528, 35},
+        {-50.184, 15.705, -0.978, 0.264, 35},
 
         --- random locations:
+        {-35.229, 9.511, -6.300, 1.291, 35},
+        {-39.567, 43.439, -6.300, 5.338, 35},
+        {-22.486, 50.704, -5.450, 4.727, 35},
+        {22.526, 50.533, -5.450, 4.659, 35},
+        {35.757, 47.298, -5.055, 3.606, 35},
+        {36.368, 3.793, -6.300, 1.851, 35},
+        {1.594, 27.893, 1.450, 0.000, 35},
+        {-1.829, 24.975, 1.450, 3.138, 35},
+        {29.944, 32.433, -5.192, 4.101, 35},
+        {7.642, 37.178, -6.300, 3.190, 35},
+        {-16.184, 34.589, -6.300, 0.173, 35},
+        {-33.536, 33.305, -5.580, 5.441, 35},
     },
 
 
@@ -341,6 +363,26 @@ return {
                     -- example locations:
                     -- {0,0,0,0},
                     -- {0,0,0,0}
+                    {-59.467, 13.242, -4.350, 30},
+                    {-69.333, 10.547, -2.050, 30},
+                    {-72.210, 9.798, 0.350, 30},
+                    {-58.108, 13.580, 0.350, 30},
+                    {59.457, 13.203, -4.350, 30},
+                    {58.105, 13.570, 0.350, 30},
+                    {72.206, 9.783, 0.350, 30},
+                    {68.969, 10.660, -2.050, 30},
+                    {6.339, 3.624, 1.350, 30},
+                    {-6.241, 3.612, 1.350, 30},
+                    {-9.388, 16.037, 3.650, 30},
+                    {9.226, 15.926, 3.650, 30},
+                    {-0.011, 46.374, 0.605, 30},
+                    {42.599, 39.585, -5.609, 30},
+                    {-36.029, 52.862, -6.300, 30},
+                    {-48.080, 32.325, -6.300, 30},
+                    {-17.633, 30.546, 5.850, 30},
+                    {18.006, 31.111, 5.850, 30},
+                    {5.664, 10.089, 5.850, 30},
+                    {-5.950, 10.213, 5.850, 30},
                 }
             }
         },

diff --git a/INDEV/Battle Royale/map settings/custom/tsce_multiplayerv1.lua b/INDEV/Battle Royale/map settings/custom/tsce_multiplayerv1.lua
@@ -42,15 +42,15 @@ return {
     -- The minimum amount of players required to start the game:
     -- Default: (2)
     --
-    required_players = 2,
+    required_players = 1,
 
 
     --- Game start delay:
     -- The amount of time (in seconds) to wait before starting the game:
     -- The start delay will not begin until the required players have joined.
     -- Default (30)
     --
-    start_delay = 30,
+    start_delay = 1,
 
 
     --- Lives:
@@ -92,42 +92,42 @@ return {
     sky_spawn_coordinates = {
 
         --- red base:
-        { -77.675, -6.244, 13.695, 6.271, 35 },
-        { -103.628, -15.827, 13.676, 6.273, 35 },
-        { -77.810, -26.053, 13.695, 6.236, 35 },
-        { -89.377, -3.657, 0.178, 5.823, 35 },
-        { -84.937, -27.452, 0.153, 0.855, 35 },
+        { -77.675, -6.244, 13.695, 6.271, 20 },
+        { -103.628, -15.827, 13.676, 6.273, 20 },
+        { -77.810, -26.053, 13.695, 6.236, 20 },
+        { -89.377, -3.657, 0.178, 5.823, 20 },
+        { -84.937, -27.452, 0.153, 0.855, 20 },
 
         --- blue base:
-        { 144.170, -25.646, 25.504, 3.809, 35 },
-        { 144.306, -14.896, 25.504, 2.388, 35 },
-        { 136.788, -36.380, 20.153, 2.437, 35 },
-        { 136.751, -7.535, 20.136, 4.997, 35 },
-        { 126.851, -16.115, 20.133, 6.109, 35 },
-        { 126.582, -24.417, 20.133, 0.176, 35 },
+        { 144.170, -25.646, 25.504, 3.809, 20 },
+        { 144.306, -14.896, 25.504, 2.388, 20 },
+        { 136.788, -36.380, 20.153, 2.437, 20 },
+        { 136.751, -7.535, 20.136, 4.997, 20 },
+        { 126.851, -16.115, 20.133, 6.109, 20 },
+        { 126.582, -24.417, 20.133, 0.176, 20 },
 
         --- random locations:
-        { 134.330, -32.701, 15.344, 2.902, 35 },
-        { 132.329, -20.330, 14.035, 3.191, 35 },
-        { 134.539, -7.473, 14.737, 3.996, 35 },
-        { 108.956, -28.441, 13.449, 2.680, 35 },
-        { 98.991, -10.425, 15.257, 0.564, 35 },
-        { 99.191, -0.754, 20.909, 4.702, 35 },
-        { 102.264, -20.573, 23.475, 1.242, 35 },
-        { 116.074, -39.340, 24.623, 0.960, 35 },
-        { 63.159, -25.815, 13.585, 3.393, 35 },
-        { 40.699, -30.475, 13.220, 4.158, 35 },
-        { 62.182, -48.633, 10.276, 4.553, 35 },
-        { 35.652, -71.148, 7.599, 4.752, 35 },
-        { 53.457, -93.681, 0.847, 3.286, 35 },
-        { 15.307, -103.340, 2.145, 0.657, 35 },
-        { -20.704, -58.845, 4.039, 5.419, 35 },
-        { -61.322, -68.757, 1.240, 2.408, 35 },
-        { -57.683, -58.814, 6.000, 5.388, 35 },
-        { -37.537, -68.410, 8.248, 5.823, 35 },
-        { -69.359, 7.105, 5.362, 3.114, 35 },
-        { -79.311, 25.592, 0.817, 0.401, 35 },
-        { -49.095, 20.836, 2.997, 5.807, 35 },
+        { 134.330, -32.701, 15.344, 2.902, 20 },
+        { 132.329, -20.330, 14.035, 3.191, 20 },
+        { 134.539, -7.473, 14.737, 3.996, 20 },
+        { 108.956, -28.441, 13.449, 2.680, 20 },
+        { 98.991, -10.425, 15.257, 0.564, 20 },
+        { 99.191, -0.754, 20.909, 4.702, 20 },
+        { 102.264, -20.573, 23.475, 1.242, 20 },
+        { 116.074, -39.340, 24.623, 0.960, 20 },
+        { 63.159, -25.815, 13.585, 3.393, 20 },
+        { 40.699, -30.475, 13.220, 4.158, 20 },
+        { 62.182, -48.633, 10.276, 4.553, 20 },
+        { 35.652, -71.148, 7.599, 4.752, 20 },
+        { 53.457, -93.681, 0.847, 3.286, 20 },
+        { 15.307, -103.340, 2.145, 0.657, 20 },
+        { -20.704, -58.845, 4.039, 5.419, 20 },
+        { -61.322, -68.757, 1.240, 2.408, 20 },
+        { -57.683, -58.814, 6.000, 5.388, 20 },
+        { -37.537, -68.410, 8.248, 5.823, 20 },
+        { -69.359, 7.105, 5.362, 3.114, 20 },
+        { -79.311, 25.592, 0.817, 0.401, 20 },
+        { -49.095, 20.836, 2.997, 5.807, 20 },
     },
 
 
@@ -390,6 +390,21 @@ return {
                     -- example locations:
                     -- {0,0,0,0},
                     -- {0,0,0,0}
+                    {-14.110, -64.008, 2.868, 30},
+                    {5.792, -60.481, 5.350, 30},
+                    {-80.016, -49.869, 1.103, 30},
+                    {-75.188, -15.920, 1.938, 30},
+                    {-73.318, -0.299, 3.382, 30},
+                    {-55.399, 2.519, 8.831, 30},
+                    {-55.969, 15.841, 5.187, 30},
+                    {-10.380, 0.674, 11.208, 30},
+                    {5.453, -29.187, 12.710, 30},
+                    {13.498, -15.646, 10.905, 30},
+                    {-8.923, -35.221, 8.991, 30},
+                    {64.416, -19.975, 19.624, 30},
+                    {155.752, 12.054, 24.061, 30},
+                    {44.747, -94.189, 1.419, 30},
+                    {142.604, -18.447, 13.633, 30},
                 }
             }
         },
@@ -403,17 +418,6 @@ return {
                     -- example locations:
                     -- {0,0,0,0},
                     -- {0,0,0,0}
-                    {-14.110, -64.008, 2.868, 30},
-                    {5.792, -60.481, 5.350, 30},
-                    {-80.016, -49.869, 1.103, 30},
-                    {-75.188, -15.920, 1.938, 30},
-                    {-73.318, -0.299, 3.382, 30},
-                    {-55.399, 2.519, 8.831, 30},
-                    {-55.969, 15.841, 5.187, 30},
-                    {-10.380, 0.674, 11.208, 30},
-                    {5.453, -29.187, 12.710, 30},
-                    {13.498, -15.646, 10.905, 30},
-                    {-8.923, -35.221, 8.991, 30},
                 },
                 ["cmt\\weapons\\evolved\\human\\battle_rifle\\_battle_rifle_specops\\battle_rifle_specops"] = {},
                 ["cmt\\weapons\\evolved_h1-spirit\\plasma_rifle\\_plasma_rifle_mp\\plasma_rifle_mp"] = {},
@@ -429,6 +433,7 @@ return {
                 ["cmt\\weapons\\evolved\\human\\battle_rifle\\battle_rifle"] = {},
             },
 
+
             ['eqip'] = {
                 ["cmt\\weapons\\evolved_h1-spirit\\plasma_grenade\\plasma_grenade"] = {},
                 ["cmt\\powerups\\human\\ammo_pack\\powerups\\battle_rifle_ammo_pack"] = {},

diff --git a/INDEV/Battle Royale/weapon degradation/degradation.lua b/INDEV/Battle Royale/weapon degradation/degradation.lua
@@ -73,7 +73,7 @@ function weapons:degrade()
 
         -- [To fix a glitch]
         -- Object id of this weapon changes if the player is attempting to
-        -- shoot and throws a grenade simultaneously.
+        -- shoot and throws a grenade simultaneously - causes the rate to return nil.
         rate = rate or 0
         --