From 3b9c926000a999463b2517ef960952a76af11d08 Mon Sep 17 00:00:00 2001
From: DodoBirb <roanvanelven@gmail.com>
Date: Sat, 21 May 2022 09:11:34 +1000
Subject: [PATCH] Added Spectator to Server

---
 Export_CodeServer/gml_Object_oLockLobby_Draw_0.gml |  4 ++--
 Export_CodeServer/gml_Object_oServer_Create_0.gml  |  4 ++--
 Export_CodeServer/gml_Object_oServer_Step_0.gml    | 11 -----------
 Export_CodeServer/gml_Script_check_items.gml       |  7 +++++--
 Export_CodeServer/gml_Script_reset_globals.gml     |  3 +++
 Export_RoomServer/room0.json                       | 14 ++++++++++++++
 6 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/Export_CodeServer/gml_Object_oLockLobby_Draw_0.gml b/Export_CodeServer/gml_Object_oLockLobby_Draw_0.gml
index 2c2cc3f..88723ea 100644
--- a/Export_CodeServer/gml_Object_oLockLobby_Draw_0.gml
+++ b/Export_CodeServer/gml_Object_oLockLobby_Draw_0.gml
@@ -1,9 +1,9 @@
 var str;
 draw_self()
 if global.lobbyLocked
-    str = "Locked"
+    str = "Spectator"
 else
-    str = "Open"
+    str = "Player"
 draw_set_halign(fa_right)
 draw_text((x - 12), (y + 6), ("Lobby State: " + str))
 draw_set_halign(fa_left)
diff --git a/Export_CodeServer/gml_Object_oServer_Create_0.gml b/Export_CodeServer/gml_Object_oServer_Create_0.gml
index 5d087c7..a6e6fd4 100644
--- a/Export_CodeServer/gml_Object_oServer_Create_0.gml
+++ b/Export_CodeServer/gml_Object_oServer_Create_0.gml
@@ -68,6 +68,8 @@ alarm[5] = 3600
 alarm[9] = 60
 alarm[10] = 600
 alarm[11] = 60
+global.totalItemCount = 0
+global.FFAItemCounter[0] = 0
 reset_globals()
 global.slot = 1
 slotStr = string(global.slot)
@@ -80,5 +82,3 @@ global.damageMult = 0
 global.clientVersion = "V1.9.4"
 global.experimental = 0
 global.freeForAll = 0
-global.totalItemCount = 0
-global.FFAItemCounter[0] = 0
diff --git a/Export_CodeServer/gml_Object_oServer_Step_0.gml b/Export_CodeServer/gml_Object_oServer_Step_0.gml
index cca4946..65cc74e 100644
--- a/Export_CodeServer/gml_Object_oServer_Step_0.gml
+++ b/Export_CodeServer/gml_Object_oServer_Step_0.gml
@@ -80,17 +80,6 @@ for (a = 0; a < ds_list_size(deadList); a++)
     if (!match)
         ds_list_delete(deadList, a)
 }
-if (ds_list_size(samusList) > 0 && ds_list_size(deadList) > 0)
-{
-    if (ds_list_size(samusList) == ds_list_size(deadList) || ds_list_size(deadList) > ds_list_size(samusList))
-    {
-        evnt = global.event[308]
-        evnt++
-        if (global.event[308] < 4)
-            global.event[308] = evnt
-        ds_list_clear(deadList)
-    }
-}
 if (ds_list_size(playerList) > 0 && ds_list_size(resetList) > 0)
 {
     if (ds_list_size(playerList) == ds_list_size(resetList) || ds_list_size(resetList) > ds_list_size(playerList))
diff --git a/Export_CodeServer/gml_Script_check_items.gml b/Export_CodeServer/gml_Script_check_items.gml
index 59955ba..c7874a1 100644
--- a/Export_CodeServer/gml_Script_check_items.gml
+++ b/Export_CodeServer/gml_Script_check_items.gml
@@ -2,7 +2,10 @@ var etankCount, i, stankCount, ptankCount, mtankCount, itemCount, h, val, sval;
 etankCount = 0
 global.totalItemCount = 0
 for (i = 0; i < array_length_1d(global.FFAItemCounter); i++)
-    global.totalItemCount += global.FFAItemCounter[i]
+{
+    if (global.FFAItemCounter[i] > global.totalItemCount)
+        global.totalItemCount = global.FFAItemCounter[i]
+}
 for (i = 0; i < array_length_1d(global.itemSamus); i++)
 {
     if (i == 50 || i == 103 || i == 108 || i == 157 || i == 158 || i == 200 || i == 201 || i == 251 || i == 254 || i == 306)
@@ -58,7 +61,7 @@ for (h = 0; h < array_length_1d(global.itemSamus); h++)
 }
 itemCount = (itemCount / 2)
 if global.freeForAll
-    itemCount = (global.totalItemCount / ds_list_size(playerList))
+    itemCount = global.totalItemCount
 global.damageMult = ((itemCount / 88) * 3)
 if global.experimental
     global.damageMult = ((itemCount / 88) * 5)
diff --git a/Export_CodeServer/gml_Script_reset_globals.gml b/Export_CodeServer/gml_Script_reset_globals.gml
index 2432ea5..ec5695e 100644
--- a/Export_CodeServer/gml_Script_reset_globals.gml
+++ b/Export_CodeServer/gml_Script_reset_globals.gml
@@ -62,4 +62,7 @@ syncedDifficulty = 1
 syncedELM = 0
 global.seed = 0
 global.rando = 1
+global.totalItemCount = 0
+for (i = 0; i < array_length_1d(global.FFAItemCounter); i++)
+    global.FFAItemCounter[i] = 0
 scr_default_global_items()
diff --git a/Export_RoomServer/room0.json b/Export_RoomServer/room0.json
index 17b627a..c5eb09b 100644
--- a/Export_RoomServer/room0.json
+++ b/Export_RoomServer/room0.json
@@ -667,6 +667,20 @@
       "pre_create_code": null,
       "image_speed": 0,
       "image_index": 0
+    },
+    {
+      "x": 910,
+      "y": 695,
+      "object_definition": "oLockLobby",
+      "instance_id": 100031,
+      "creation_code": null,
+      "scale_x": 1,
+      "scale_y": 1,
+      "color": 4294967295,
+      "rotation": 0,
+      "pre_create_code": null,
+      "image_speed": 0,
+      "image_index": 0
     }
   ],
   "tiles": [],