Merge branch 'main' into dev

.gitignore

@@ -11,6 +11,10 @@ scripts/pal_swap_*
 exports
 datafiles
 help.rtf
+datafiles/lang/*
+datafiles/mods/*
+datafiles/modifiers.ini
+exports
 extensions
 AM2R.exe
 data.win

AM2R.project.gmx

@@ -4374,6 +4374,7 @@
       <script>scripts\strict_encode_verb.gml</script>
       <script>scripts\create_buffer.gml</script>
       <script>scripts\send_seed.gml</script>
+      <script>scripts\popup_text_ext.gml</script>
     </scripts>
   </scripts>
   <shaders name="shaders">

README.md

@@ -5,7 +5,7 @@ The source code here has the same requirements as the original repo in order for
 
 Currently syncs all items, metroids, events, and power-ups.
 
-Currently, pressing F1 will make an attempt to connect to the server. F2 will disconnect from the server. 
+Currently, pressing F1 will make an attempt to connect to the server. F2 will disconnect from the server. F3 will show the current random seed.
 
 Put the ip of the server you want to connect to into the ipaddress.txt. The server operates on port 64198 and cannot be changed at the moment.
 

objects/oClient.object.gmx

@@ -367,15 +367,9 @@ if(keyboard_check_pressed(vk_f2)){
     instance_destroy();
 }
 
-/*
 if(keyboard_check_pressed(vk_f3)){
-    var f = 0;
-    repeat(41){
-        global.metdead[f] = 1;
-        f++;
-    }
+    popup_text_ext(string(oControl.seed), 300);
 }
-*/
 </string>
           </argument>
         </arguments>

scripts/popup_text_ext.gml

@@ -0,0 +1,5 @@
+/// popup_text_ext
+with (oPopupText) instance_destroy();
+var t = instance_create(0, 0, oPopupText);
+t.text = argument0;
+t.alarm[0] = argument1;

scripts/send_seed.gml

@@ -9,4 +9,4 @@ buffer_write(seedBuffer, buffer_u8, 3);
 buffer_write(seedBuffer, buffer_f64, oControl.seed);
 buffer_write(seedBuffer, buffer_u8, global.clientID);
 var result = network_send_packet(oClient.socket, seedBuffer, buffer_tell(seedBuffer));
-popup_text("Seed sent");
+popup_text("Seed sent");