Moved 1.4 changes from private repo

Author: milesthenerd

AM2R Server.project.gmx

@@ -58,6 +58,10 @@
     <sprite>sprites\sGenerateSeed</sprite>
     <sprite>sprites\sCycleRando</sprite>
     <sprite>sprites\sCustomSeed</sprite>
+    <sprite>sprites\sSAXMode</sprite>
+    <sprite>sprites\sSAXModeToggle</sprite>
+    <sprite>sprites\sLockLobby</sprite>
+    <sprite>sprites\sModPassword</sprite>
   </sprites>
   <backgrounds name="background"/>
   <paths name="paths"/>
@@ -208,6 +212,11 @@
     <object>objects\oGenerateSeed</object>
     <object>objects\oCustomSeed</object>
     <object>objects\oCycleRando</object>
+    <object>objects\oSAXMode</object>
+    <object>objects\oSAXModeButton</object>
+    <object>objects\oSAXModeToggle</object>
+    <object>objects\oLockLobby</object>
+    <object>objects\oModPassword</object>
   </objects>
   <rooms name="rooms">
     <room>rooms\room0</room>

Configs/Default.config.gmx

@@ -211,7 +211,7 @@
     <option_changeresolution>false</option_changeresolution>
     <option_closeesc>true</option_closeesc>
     <option_colordepth>0</option_colordepth>
-    <option_display_name>AM2R Server 1.3</option_display_name>
+    <option_display_name>AM2R Server 1.4</option_display_name>
     <option_displayerrors>True</option_displayerrors>
     <option_ecma>0</option_ecma>
     <option_facebook_app_display_name></option_facebook_app_display_name>
@@ -351,7 +351,7 @@
     <option_ios_texture_page>1024</option_ios_texture_page>
     <option_ios_use_test_ads>false</option_ios_use_test_ads>
     <option_lastchanged></option_lastchanged>
-    <option_linux_display_name>AM2R Server 1.3</option_linux_display_name>
+    <option_linux_display_name>AM2R Server 1.4</option_linux_display_name>
     <option_linux_enable_steam>0</option_linux_enable_steam>
     <option_linux_fullscreen>0</option_linux_fullscreen>
     <option_linux_homepage></option_linux_homepage>

README.md

@@ -1,7 +1,7 @@
 # AM2R Server
 String compression scripts are by Homunculus: https://marketplace.yoyogames.com/assets/4560/strict
 
-Server icon and Linux splash made by ShirtyScarab554.
+Server icon made by ShirtyScarab554.
 
 Runs on port 64198 by default but can be changed within the server.
 

objects/oAmmoSync.object.gmx

@@ -52,6 +52,8 @@ image_speed = 0;
             <string>if(global.ammoSync){
     image_index = 0;
 } else image_index = 1;
+
+if(global.saxmode) global.ammoSync = false;
 </string>
           </argument>
         </arguments>
@@ -74,7 +76,7 @@ image_speed = 0;
         <arguments>
           <argument>
             <kind>1</kind>
-            <string>global.ammoSync = !global.ammoSync;
+            <string>if(!global.saxmode) global.ammoSync = !global.ammoSync;
 </string>
           </argument>
         </arguments>

objects/oControl.object.gmx

@@ -43,6 +43,8 @@ oItemIBeam = undefined;
 oItemWBeam = undefined;
 oItemSBeam = undefined;
 oItemPBeam = undefined;
+
+global.readyMap = ds_map_create();
 </string>
           </argument>
         </arguments>

objects/oCustomSeed.object.gmx

@@ -79,7 +79,26 @@ if(ID == msg){
         if(is_real(input)){
             random_set_seed(input);
             global.seed = input;
-            with(oGenerateSeed) event_user(0);
+            if(global.seed == 0){
+                scr_default_global_items();
+            } else {
+                switch(global.rando){
+                    case 0:
+                        scr_randomizer();
+                        break;
+                    case 1:
+                        scr_randomizer_pure();
+                        break;
+                    case 2:
+                        scr_rand_split_powerups();
+                        break;
+                    case 3:
+                        scr_randomizer_split_items();
+                        break;
+                }
+                
+                oServer.alarm[10] = 30;
+            }
         }
     }
 }

objects/oEventSync.object.gmx

@@ -52,6 +52,8 @@ image_speed = 0;
             <string>if(global.eventSync){
     image_index = 0;
 } else image_index = 1;
+
+if(global.saxmode) global.eventSync = true;
 </string>
           </argument>
         </arguments>
@@ -74,7 +76,7 @@ image_speed = 0;
         <arguments>
           <argument>
             <kind>1</kind>
-            <string>global.eventSync = !global.eventSync;
+            <string>if(!global.saxmode) global.eventSync = !global.eventSync;
 </string>
           </argument>
         </arguments>

objects/oGenerateSeed.object.gmx

@@ -92,6 +92,7 @@ event_user(0);
 
     oServer.alarm[10] = 30;
 }
+
 </string>
           </argument>
         </arguments>

objects/oHealthSync.object.gmx

@@ -52,6 +52,8 @@ image_speed = 0;
             <string>if(global.healthSync){
     image_index = 0;
 } else image_index = 1;
+
+if(global.saxmode) global.healthSync = false;
 </string>
           </argument>
         </arguments>
@@ -74,7 +76,7 @@ image_speed = 0;
         <arguments>
           <argument>
             <kind>1</kind>
-            <string>global.healthSync = !global.healthSync;
+            <string>if(!global.saxmode) global.healthSync = !global.healthSync;
 </string>
           </argument>
         </arguments>

objects/oItemSync.object.gmx

@@ -52,6 +52,8 @@ image_speed = 0;
             <string>if(global.itemSync){
     image_index = 0;
 } else image_index = 1;
+
+if(global.saxmode) global.itemSync = true;
 </string>
           </argument>
         </arguments>
@@ -74,7 +76,7 @@ image_speed = 0;
         <arguments>
           <argument>
             <kind>1</kind>
-            <string>global.itemSync = !global.itemSync;
+            <string>if(!global.saxmode) global.itemSync = !global.itemSync;
 </string>
           </argument>
         </arguments>