Changed things to let the mod run on Android, and started on lang fixes

AM2R.project.gmx

@@ -1030,23 +1030,6 @@
       </ConfigOptions>
       <filename>readme.txt</filename>
     </datafile>
-    <datafile>
-      <name>dictionary.json</name>
-      <exists>-1</exists>
-      <size>4643</size>
-      <exportAction>2</exportAction>
-      <exportDir></exportDir>
-      <overwrite>0</overwrite>
-      <freeData>-1</freeData>
-      <removeEnd>0</removeEnd>
-      <store>0</store>
-      <ConfigOptions>
-        <Config name="Default">
-          <CopyToMask>9223372036854775807</CopyToMask>
-        </Config>
-      </ConfigOptions>
-      <filename>dictionary.json</filename>
-    </datafile>
     <datafiles number="325" name="mods">
       <datafiles number="325" name="titles">
         <datafile>

Configs/Default.config.gmx

@@ -21,10 +21,10 @@
     <option_android_arch_mipsr2>false</option_android_arch_mipsr2>
     <option_android_arch_mipsr2sf>false</option_android_arch_mipsr2sf>
     <option_android_arch_x86>True</option_android_arch_x86>
-    <option_android_build_tools_version>23.0.1</option_android_build_tools_version>
+    <option_android_build_tools_version>28.0.3</option_android_build_tools_version>
     <option_android_build_version>2</option_android_build_version>
     <option_android_color_depth>1</option_android_color_depth>
-    <option_android_compile_sdk_version>23</option_android_compile_sdk_version>
+    <option_android_compile_sdk_version>28</option_android_compile_sdk_version>
     <option_android_display_name>AM2R</option_android_display_name>
     <option_android_facebook_app_display_name></option_android_facebook_app_display_name>
     <option_android_facebook_appid></option_android_facebook_appid>
@@ -51,7 +51,7 @@
     <option_android_licensing_key></option_android_licensing_key>
     <option_android_lint>0</option_android_lint>
     <option_android_major_version>1</option_android_major_version>
-    <option_android_min_sdk_version>9</option_android_min_sdk_version>
+    <option_android_min_sdk_version>14</option_android_min_sdk_version>
     <option_android_minor_version>5</option_android_minor_version>
     <option_android_mmedia_ads>0</option_android_mmedia_ads>
     <option_android_moga>0</option_android_moga>
@@ -65,7 +65,7 @@
     <option_android_package_company>lojical</option_android_package_company>
     <option_android_package_domain>com</option_android_package_domain>
     <option_android_package_product>AM2R</option_android_package_product>
-    <option_android_permission_flags>16</option_android_permission_flags>
+    <option_android_permission_flags>24</option_android_permission_flags>
     <option_android_pocketchange_enable>false</option_android_pocketchange_enable>
     <option_android_pocketchange_id></option_android_pocketchange_id>
     <option_android_pocketchange_test_enable>false</option_android_pocketchange_test_enable>
@@ -77,8 +77,8 @@
     <option_android_sleep_margin>4</option_android_sleep_margin>
     <option_android_splash_png>Configs\Default\android\splash.png</option_android_splash_png>
     <option_android_splash_time>0</option_android_splash_time>
-    <option_android_support_lib_version>23.1.1</option_android_support_lib_version>
-    <option_android_target_sdk_version>23</option_android_target_sdk_version>
+    <option_android_support_lib_version>25.3.1</option_android_support_lib_version>
+    <option_android_target_sdk_version>28</option_android_target_sdk_version>
     <option_android_texture_page>1024</option_android_texture_page>
     <option_android_use_test_ads>false</option_android_use_test_ads>
     <option_androidfire_GPU_device>0</option_androidfire_GPU_device>

objects/oA4EscapeControl.object.gmx

@@ -60,7 +60,9 @@ mus_current_stop();
             <kind>1</kind>
             <string>if (global.ingame &amp;&amp; room != rm_transition) {
     if (temp &gt;= 100) {
-        event_user(0);
+        if(room == rm_a4b01){
+            event_user(0);
+        }
     } else alarm[2] = 30;
 } else alarm[2] = 1;
 </string>
@@ -198,9 +200,14 @@ if (surface_exists(oControl.gui_surface)) {
     if (steps &gt; 300) {
         bgw = temp / 100 * 160;
         if (temp &gt;= 100) {
-            if (room != rm_a4b01) {
+            if (room == rm_a4b02 || room == rm_a4b03 || room == rm_a4b04 || room == rm_a4b05 || room == rm_a4b06 || room == rm_a4b07 || room == rm_a4b08 || room == rm_a4b09 || room == rm_a4b10 || room == rm_a4b11 || room == rm_a4b12 || room == rm_a4b13 || room == rm_a4b14 || room == rm_a4b15 || room == rm_a4b16 || room == rm_a4b17 || room == rm_a4b18 || room == rm_a4b19) {
                 instance_create(oCharacter.x, oCharacter.y + 480, oA4EscapeExplosionFail);
                 instance_destroy();
+            } else {
+                with (oA4EscapeSeqFX) instance_destroy();
+                global.event[203] = 9;
+                instance_destroy();
+                popup_text_ext("Reactor destroyed", 240);
             }
         }
     }

objects/oClient.object.gmx

@@ -26,7 +26,7 @@
           <argument>
             <kind>1</kind>
             <string>network_set_config(network_config_connect_timeout, 5000);
-strict_init("dictionary.json");
+strict_init(working_directory + "\dictionary.json");
 queenHealthResetQueued = false;
 canSend = false;
 metroidCountChanged = false;
@@ -56,7 +56,7 @@ mtanksTimer = 10;
 stanksTimer = 10;
 ptanksTimer = 10;
 teleportTimer = 180;
-disconnectTimer = 600;
+disconnectTimer = 900;
 pingTimer = 90;
 teleport = false;
 noName = false;
@@ -174,9 +174,9 @@ update_variables("initprev");
 update_variables("onlinevars");
 
 if(global.shaders_compiled){
-    alpha = 1
+    alpha = 1;
 } else {
-    alpha = 0.5
+    alpha = 0.8;
 }
 
 posX = 3;
@@ -1170,7 +1170,7 @@ if(room == rm_a4b01 &amp;&amp; global.event[203] == 9 &amp;&amp; instance_exists
     }
 }
 
-if(!instance_exists(oQueen)){
+if(!instance_exists(oQueen) &amp;&amp; global.event[303] == 0){
     if(!queenHealthResetQueued){
         queenHealthResetQueued = true;
         alarm[1] = 5;
@@ -1238,13 +1238,20 @@ if(instance_exists(oCharacter) &amp;&amp; (oCharacter.state == oCharacter.SAVING
     refill_heath_ammo();
 }
 
+//Ensure that reloading a save doesn't disable Extreme Lab Metroids
+if(oControl.mod_monstersextremecheck == 1 &amp;&amp; oControl.mod_monstersextreme == 0 &amp;&amp; global.event[302] &gt; 0){
+    oControl.mod_monstersextreme = 1;
+} else if(oControl.mod_monstersextremecheck == 0 &amp;&amp; oControl.mod_monstersextreme == 1){
+    oControl.mod_monstersextreme = 0;
+}
+
 //Sends event 309 to make sure all players can fight guardian
 if(global.log[21] &gt; 0 &amp;&amp; global.event[309] == 0){
     global.event[309] = 1;
 }
 
 if(global.event[309] == 1 &amp;&amp; global.log[21] &lt; 1){
-    global.log[21] = 2;
+    global.log[21] = 1;
 }
 //End of guardian event check
 
@@ -1567,7 +1574,8 @@ if(instance_exists(self)){
         <arguments>
           <argument>
             <kind>1</kind>
-            <string>if(!global.acceptPacket) exit;
+            <string>disconnectTimer = 900;
+if(!global.acceptPacket) exit;
 
 var type_event = ds_map_find_value(async_load, "type");
 
@@ -1769,9 +1777,6 @@ switch(type_event){
                                 ds_list_add(checkList, arr[0]);
                                 if(arr[0] == clientID){
                                     posData[| v] = arrPosData;
-                                    if(instance_exists(oMapCursor) &amp;&amp; surface_exists(oSS_Control.s_map)){
-                                        surface_free(oSS_Control.s_map);
-                                    }
                                 }
                             }
                             
@@ -1807,9 +1812,6 @@ switch(type_event){
             case 102:
                 ds_list_read(global.idList, strict_decompress(buffer_read(_buffer, buffer_string)));
                 break;
-            case 103:
-                disconnectTimer = 600;
-                break;
             case 104:
                 var playerHealth = buffer_read(_buffer, buffer_s16);
                 var missiles = buffer_read(_buffer, buffer_s16);
@@ -2057,6 +2059,10 @@ switch(type_event){
                                                 if (global.currentsuit == 2) sprite_index = scr_suit_sprites(sGFront,sFront_fusion);
                                                 global.enablecontrol = 0;
                                                 oControl.displaygui = 0;
+                                                xVel = 0;
+                                                yVel = 0;
+                                                xAcc = 0;
+                                                yAcc = 0;
                                             }
                                         }
                                         popup_text_ext("Ship reached", 120);
@@ -2064,13 +2070,37 @@ switch(type_event){
                                     if(eventArr[f, 0] == 2 &amp;&amp; clientID != global.clientID){
                                         oControl.displaygui = 0;
                                         global.enablecontrol = 0;
+                                        if(instance_exists(oCharacter)){
+                                            with(oCharacter){
+                                                xVel = 0;
+                                                yVel = 0;
+                                                xAcc = 0;
+                                                yAcc = 0;
+                                            }
+                                        }
                                     }
                                     if(eventArr[f, 0] == 3 &amp;&amp; clientID != global.clientID){
                                         instance_create(0, 0, oFinalFadeout);
                                         mus_fadeout(musHatchling);
                                         global.enablecontrol = 0;
+                                        if(instance_exists(oCharacter)){
+                                            with(oCharacter){
+                                                xVel = 0;
+                                                yVel = 0;
+                                                xAcc = 0;
+                                                yAcc = 0;
+                                            }
+                                        }
                                     }
                                     if(eventArr[f, 0] == 4 &amp;&amp; clientID != global.clientID){
+                                        if(instance_exists(oCharacter)){
+                                            with(oCharacter){
+                                                xVel = 0;
+                                                yVel = 0;
+                                                xAcc = 0;
+                                                yAcc = 0;
+                                            }
+                                        }
                                         remove_persistent_objects();
                                         sfx_stop_all();
                                         global.vibL = 0;
@@ -2113,6 +2143,10 @@ switch(type_event){
                                         if(global.ingame){
                                             with (oControl) event_user(2);
                                         }
+                                        
+                                        if(instance_exists(oMapCursor) &amp;&amp; surface_exists(oSS_Control.s_map)){
+                                            surface_free(oSS_Control.s_map);
+                                        }
                                     }
                                 }
                             }
@@ -2714,6 +2748,10 @@ switch(type_event){
                 if(global.ingame){
                     with (oControl) event_user(2);
                 }
+                
+                if(instance_exists(oMapCursor) &amp;&amp; surface_exists(oSS_Control.s_map)){
+                    surface_free(oSS_Control.s_map);
+                }
                 break;
         }
 }
@@ -2868,8 +2906,29 @@ if(!noName){
                 draw_set_alpha(arrFXTimer * 0.1);
                 if(global.shaders_compiled){
                     pal_swap_set(oControl.SpiderballPalette, arrID, false);
+                    draw_sprite_ext(sSpiderballFX, -1, arrX, arrY, 1, 1, 0, -1, 0.2 + arrFXTimer * 0.1);
+                } else {
+                    switch(arrSprite){
+                        case sSpiderMorphBall:
+                            draw_sprite_ext(sSpiderballFX, -1, arrX, arrY, 1, 1, 0, -1, 0.2 + arrFXTimer * 0.1);
+                            break;
+                        case sVSpiderMorphBall:
+                            draw_sprite_ext(sSpiderballFXVaria, -1, arrX, arrY, 1, 1, 0, -1, 0.2 + arrFXTimer * 0.1);
+                            break;
+                        case sGSpiderMorphBall:
+                            draw_sprite_ext(sSpiderballFXGravity, -1, arrX, arrY, 1, 1, 0, -1, 0.2 + arrFXTimer * 0.1);
+                            break;
+                        case sSpiderMorphBall_fusion:
+                            draw_sprite_ext(sSpiderballFX_fusion, -1, arrX, arrY, 1, 1, 0, -1, 0.2 + arrFXTimer * 0.1);
+                            break;
+                        case sSpiderballFXVaria_fusion:
+                            draw_sprite_ext(sSpiderballFXVaria_fusion, -1, arrX, arrY, 1, 1, 0, -1, 0.2 + arrFXTimer * 0.1);
+                            break;
+                        case sSpiderballFXGravity_fusion:
+                            draw_sprite_ext(sSpiderballFXGravity_fusion, -1, arrX, arrY, 1, 1, 0, -1, 0.2 + arrFXTimer * 0.1);
+                            break;
+                    }
                 }
-                draw_sprite_ext(sSpiderballFX, -1, arrX, arrY, 1, 1, 0, -1, 0.2 + arrFXTimer * 0.1);
                 if(global.shaders_compiled){
                     pal_swap_reset();
                     shader_reset();

objects/oMAlpha.object.gmx

@@ -1050,8 +1050,8 @@ if (sfx_isplaying(sndMAlphaIntro)) sfx_stop(sndMAlphaIntro);
           <argument>
             <kind>1</kind>
             <string>
-if((oControl.mod_fusion == 1) || (oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled)) {
-    pal_swap_set(oControl.AlphaPalette, 1, false);
+if((oControl.mod_fusion == 1) || oControl.MonsterPalettesFusionOnly == 0) {
+    if(global.shaders_compiled) pal_swap_set(oControl.AlphaPalette, 1, false);
 }
 
 if (!flashing) draw_sprite_ext(sprite_index, -1, x, y, facing, 1, image_angle, -1, 1);

objects/oMAlphaTriggerA2.object.gmx

@@ -231,8 +231,8 @@ instance_destroy();
           <argument>
             <kind>1</kind>
             <string>
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
-    pal_swap_set(oControl.AlphaPalette, 1, false);
+if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) {
+    if(global.shaders_compiled) pal_swap_set(oControl.AlphaPalette, 1, false);
 }
 
 draw_self();

objects/oMAlphaTriggerA3AL.object.gmx

@@ -156,8 +156,8 @@ instance_destroy();
           <argument>
             <kind>1</kind>
             <string>
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
-    pal_swap_set(oControl.AlphaPalette, 1, false);
+if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) {
+    if(global.shaders_compiled) pal_swap_set(oControl.AlphaPalette, 1, false);
 }
 
 draw_self();

objects/oMAlphaTriggerFirstCocoon.object.gmx

@@ -172,8 +172,8 @@ with (oControl) event_user(2);
           <argument>
             <kind>1</kind>
             <string>
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
-    pal_swap_set(oControl.AlphaPalette, 1, false);
+if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) {
+    if(global.shaders_compiled) pal_swap_set(oControl.AlphaPalette, 1, false);
 }
 
 draw_self();

objects/oMAlphaTriggerProx.object.gmx

@@ -181,8 +181,8 @@ instance_destroy();
         <arguments>
           <argument>
             <kind>1</kind>
-            <string>if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
-    pal_swap_set(oControl.AlphaPalette, 1, false);
+            <string>if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) {
+    if(global.shaders_compiled) pal_swap_set(oControl.AlphaPalette, 1, false);
 }
 
 draw_self();

objects/oMGamma.object.gmx

@@ -1244,8 +1244,8 @@ if (sfx_isplaying(sndMAlphaIntro)) sfx_stop(sndMAlphaIntro);
           <argument>
             <kind>1</kind>
             <string>
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
-    pal_swap_set(oControl.GammaPalette, 1, false);
+if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) {
+    if(global.shaders_compiled) pal_swap_set(oControl.GammaPalette, 1, false);
 }
 
 if (!flashing) {

objects/oMGammaMutate.object.gmx

@@ -130,8 +130,8 @@ statetime += 1;
           <argument>
             <kind>1</kind>
             <string>
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
-    pal_swap_set(oControl.GammaPalette, 1, false);
+if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) {
+    if(global.shaders_compiled) pal_swap_set(oControl.GammaPalette, 1, false);
 }
 
 alpha2 = image_index - floor(image_index);

objects/oMGammaTriggerProx.object.gmx

@@ -205,8 +205,8 @@ legbb2y = lengthdir_y(12, currentangle + 256);
           <argument>
             <kind>1</kind>
             <string>
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
-    pal_swap_set(oControl.GammaPalette, 1, false);
+if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) {
+    if(global.shaders_compiled) pal_swap_set(oControl.GammaPalette, 1, false);
 }
 
 draw_sprite_ext(sMGammaLegBA1, -1, x + legba1x, y + legba1y, facing, 1, 0, -1, 1);

objects/oMOmega.object.gmx

@@ -1784,8 +1784,8 @@ if (myhealth > 0) {
           <argument>
             <kind>1</kind>
             <string>
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
-    pal_swap_set(oControl.OmegaPalette, 1, false);
+if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) {
+    if(global.shaders_compiled) pal_swap_set(oControl.OmegaPalette, 1, false);
 }
 
 if (surface_exists(surf)) {

objects/oMOmegaTail.object.gmx

@@ -87,8 +87,8 @@ if (timer > 9999999) timer = 0;
           <argument>
             <kind>1</kind>
             <string>
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
-    pal_swap_set(oControl.OmegaPalette, 1, false);
+if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) {
+    if(global.shaders_compiled) pal_swap_set(oControl.OmegaPalette, 1, false);
 }
 
 var i;

objects/oMOmegaTailMutate.object.gmx

@@ -111,8 +111,8 @@ if (image_index == 0) {
           <argument>
             <kind>1</kind>
             <string>
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
-    pal_swap_set(oControl.OmegaPalette, 1, false);
+if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) {
+    if(global.shaders_compiled) pal_swap_set(oControl.OmegaPalette, 1, false);
 }
 
 draw_sprite_ext(sprite_index, -1, x + offx, y + offy, image_xscale, 1, 0, -1, 1);

objects/oMZeta.object.gmx

@@ -1627,8 +1627,8 @@ if (myhealth > 0) {
           <argument>
             <kind>1</kind>
             <string>
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
-    pal_swap_set(oControl.ZetaPalette, 1, false);
+if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) {
+    if(global.shaders_compiled) pal_swap_set(oControl.ZetaPalette, 1, false);
 }
 
 if (surface_exists(surf)) {

objects/oMZetaHead.object.gmx

@@ -135,8 +135,8 @@ if (other.invincible == 0) {
           <argument>
             <kind>1</kind>
             <string>
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
-    pal_swap_set(oControl.ZetaPalette, 1, false);
+if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) {
+    if(global.shaders_compiled) pal_swap_set(oControl.ZetaPalette, 1, false);
 }
 
 if (head_spr != -4) draw_sprite_ext(head_spr, head_frame, x, y, facing, 1, image_angle, -1, 1);

objects/oOptionsMod.object.gmx

@@ -272,8 +272,8 @@ if (active) {
     
     
     
-    if (oControl.kMenu1 && oControl.kMenu1PushedSteps == 0) {
-        if (global.curropt == num_ip) {
+    if (keyboard_check_pressed(vk_space) && oControl.kMenu1PushedSteps == 0) {
+        if (global.curropt == num_ip && os_type != os_android) {
             editing = !editing;
             op[num_ip].editing = editing;
             if(editing){
@@ -281,8 +281,14 @@ if (active) {
             }
             sfx_play(sndMenuSel);
             event_user(2);
+        } else if(global.curropt == num_ip && os_type == os_android){
+            if(!editing){
+                msg = get_string_async("Type in the IP Address to connect to.", ip);
+            }
+            editing = !editing;
+            op[num_ip].editing = editing;
         }
-        if (global.curropt == num_port) {
+        if (global.curropt == num_port && os_type != os_android) {
             editing = !editing;
             op[num_port].editing = editing;
             if(editing){
@@ -290,8 +296,14 @@ if (active) {
             }
             sfx_play(sndMenuSel);
             event_user(2);
-        }
-        if (global.curropt == num_name) {
+        } else if(global.curropt = num_port && os_type == os_android){
+            if(!editing){
+                msg = get_integer_async("Type in the server port.", real(port));
+            }
+            editing = !editing;
+            op[num_port].editing = editing;
+        } 
+        if (global.curropt == num_name && os_type != os_android) {
             editing = !editing;
             op[num_name].editing = editing;
             if(editing){
@@ -299,6 +311,12 @@ if (active) {
             }
             sfx_play(sndMenuSel);
             event_user(2);
+        } else if(global.curropt == num_name && os_type == os_android){
+            if(!editing){
+                msg = get_string_async("Type in your nametag.", name);
+            }
+            editing = !editing;
+            op[num_name].editing = editing;
         }
         if (global.curropt == num_connection){
             if(!instance_exists(oClient) && global.canConnect){
@@ -336,17 +354,17 @@ if (active) {
     }
     */
     
-    if(editing && global.curropt == num_ip){
+    if(editing && global.curropt == num_ip && os_type != os_android){
         ip = keyboard_string;
         op[num_ip].optext = ip;
     }
     
-    if(editing && global.curropt == num_port){
+    if(editing && global.curropt == num_port && os_type != os_android){
         port = keyboard_string;
         op[num_port].optext = port;
     }
     
-    if(editing && global.curropt == num_name){
+    if(editing && global.curropt == num_name && os_type != os_android){
         var keyboardLength = string_length(keyboard_string);
         if(keyboardLength > 15){
             keyboard_string = string_copy(keyboard_string, 1, 15);
@@ -359,13 +377,85 @@ if (targety != y) y += (targety - y) / 10;
 timer -= 1;
 if (timer < 0) timer = 8;
 
-if(instance_exists(oClient)){
+if(instance_exists(oClient) && instance_exists(self) && instance_exists(connID)){
     connectiontxt = "Disconnect";
     op[num_connection].label = connectiontxt;
-} else {
+} else if((!instance_exists(oClient)) && instance_exists(self) && instance_exists(connID)){
     connectiontxt = "Connect";
     op[num_connection].label = connectiontxt;
 }
+</string>
+          </argument>
+        </arguments>
+      </action>
+    </event>
+    <event eventtype="7" enumb="63">
+      <action>
+        <libid>1</libid>
+        <id>603</id>
+        <kind>7</kind>
+        <userelative>0</userelative>
+        <isquestion>0</isquestion>
+        <useapplyto>-1</useapplyto>
+        <exetype>2</exetype>
+        <functionname></functionname>
+        <codestring></codestring>
+        <whoName>self</whoName>
+        <relative>0</relative>
+        <isnot>0</isnot>
+        <arguments>
+          <argument>
+            <kind>1</kind>
+            <string>var ID = ds_map_find_value(async_load, "id");
+
+if(ID == msg &amp;&amp; global.curropt == num_ip){
+    if(ds_map_find_value(async_load, "status")){
+        var input = ds_map_find_value(async_load, "result");
+        if(is_string(input)){
+            ini_open(working_directory + "\settings.ini");
+            ini_write_string("Settings", "ipaddress", input);
+            ini_close();
+            ip = input;
+            oControl.ipaddress = ip;
+            op[num_ip].optext = ip;
+            event_user(2);
+        }
+    }
+    editing = !editing;
+    op[num_ip].editing = editing;
+}
+
+if(ID == msg &amp;&amp; global.curropt == num_port){
+    if(ds_map_find_value(async_load, "status")){
+        var input = ds_map_find_value(async_load, "value");
+        if(is_real(input)){
+            ini_open(working_directory + "\settings.ini");
+            ini_write_real("Settings", "port", input);
+            ini_close();
+            port = string(input);
+            op[num_port].optext = port;
+            event_user(2);
+        }
+    }
+    editing = !editing;
+    op[num_port].editing = editing;
+}
+
+if(ID == msg &amp;&amp; global.curropt == num_name){
+    if(ds_map_find_value(async_load, "status")){
+        var input = ds_map_find_value(async_load, "result");
+        if(is_string(input)){
+            ini_open(working_directory + "\settings.ini");
+            ini_write_string("Settings", "name", input);
+            ini_close();
+            name = input;
+            op[num_name].optext = name;
+            event_user(2);
+        }
+    }
+    editing = !editing;
+    op[num_name].editing = editing;
+}
 </string>
           </argument>
         </arguments>
@@ -396,6 +486,7 @@ op[num_ip].optext = ip;
 op[num_port].optext = port;
 op[num_name].optext = name;
 
+
 switch(oControl.preferredcolor){
     case 1:
         op[num_color].optext = "Green";
@@ -622,6 +713,10 @@ op[num_sequence].optionid = num_sequence;
 op[num_color] = instance_create(x, y + sep * tempcount++, oOptionLR);
 op[num_color].label = "Preferred color";
 op[num_color].optionid = num_color;
+if(!global.shaders_compiled){
+    op[num_color].enabled = 0;
+    canedit[num_color] = 0;
+}
 
 op[num_showname] = instance_create(x, y + sep * tempcount++, oOptionLR);
 op[num_showname].label = "Show names";
@@ -630,6 +725,7 @@ op[num_showname].optionid = num_showname;
 op[num_connection] = instance_create(x, y + sep * tempcount++, oPauseOption);
 op[num_connection].optionid = num_connection;
 op[num_connection].label = connectiontxt;
+connID = op[num_connection].id;
 
 op[lastitem] = instance_create(x, y + sep * (lastitem + 1), oPauseOption);
 op[lastitem].optionid = lastitem;

objects/oQueen.object.gmx

@@ -886,8 +886,8 @@ with (leg2b_obj) instance_destroy();
           <argument>
             <kind>1</kind>
             <string>
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
-    pal_swap_set(oControl.QueenPalette, 1, false);
+if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) {
+    if(global.shaders_compiled) pal_swap_set(oControl.QueenPalette, 1, false);
 }
 
 if (!flashing) {

objects/oQueenFront.object.gmx

@@ -99,8 +99,8 @@ fxtimer = 0;
           <argument>
             <kind>1</kind>
             <string>
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
-    pal_swap_set(oControl.QueenPalette, 1, false);
+if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) {
+    if(global.shaders_compiled) pal_swap_set(oControl.QueenPalette, 1, false);
 }
 
 draw_sprite_ext(sQueenBelly, -1, x, y, 1, 1, image_angle, -1, 0.5);

objects/oQueenHead.object.gmx

@@ -982,8 +982,8 @@ if (myhealth <= 0 && state != 100 && state != 50) {
           <argument>
             <kind>1</kind>
             <string>
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
-    pal_swap_set(oControl.QueenPalette, 1, false);
+if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) {
+    if(global.shaders_compiled) pal_swap_set(oControl.QueenPalette, 1, false);
 }
 
 var i, soff_x, soff_y;

objects/oQueenLegBack.object.gmx

@@ -168,8 +168,8 @@ repeat (3) {
           <argument>
             <kind>1</kind>
             <string>
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
-    pal_swap_set(oControl.QueenPalette, 2, false);
+if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) {
+    if(global.shaders_compiled) pal_swap_set(oControl.QueenPalette, 2, false);
 }
 
 if (!flashing) {

objects/oQueenLegFront.object.gmx

@@ -270,8 +270,8 @@ repeat (3) {
           <argument>
             <kind>1</kind>
             <string>
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
-    pal_swap_set(oControl.QueenPalette, 2, false);
+if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) {
+    if(global.shaders_compiled) pal_swap_set(oControl.QueenPalette, 2, false);
 }
 
 if (!flashing) {

scripts/load_resources.gml

@@ -279,14 +279,6 @@ oControl.QueenDead = -1;
 oControl.QueenBloodDrop = -1;
 oControl.QueenBloodParticle = -1;
 
-oControl.MultitroidPalette = sPalMultitroidNew;
-oControl.MultitroidPaletteFusion = sPalMultitroidFusion;
-oControl.SpiderballPalette = sPalSpiderball;
-oControl.MultitroidBabyPalette = sPalMultitroidBaby;
-oControl.MultitroidIcon = sMultitroidIcon;
-oControl.MultitroidIconDark = sDarkMultitroidPlayer;
-oControl.MultitroidMapIcon = sMultitroidMapIcon;
-
 if (file_exists("mods/palettes/monsters/alpha.png")) oControl.AlphaPalette = sprite_add("mods/palettes/monsters/alpha.png", 1, false, false, 0, 0);
 if (file_exists("mods/palettes/monsters/gamma.png")) oControl.GammaPalette = sprite_add("mods/palettes/monsters/gamma.png", 1, false, false, 0, 0);
 if (file_exists("mods/palettes/monsters/zeta.png")) oControl.ZetaPalette  = sprite_add("mods/palettes/monsters/zeta.png", 1, false, false, 0, 0);
@@ -436,4 +428,3 @@ sprite_merge(icon_duplicate, icon_duplicate8);
 if(i == 8){
     oControl.MultitroidMapIcon = icon_duplicate;
 }
-

scripts/strict_init.gml

@@ -3,7 +3,6 @@
 /*
     Read dictionary file
 */
-
 globalvar _strict_data;
 
 var json_data = "";
@@ -15,4 +14,5 @@ while (!file_text_eof(f)) {
 }
 file_text_close(f);
 
+
 _strict_data = json_decode(json_data);

scripts/sv6_get_main.gml

@@ -3,8 +3,8 @@ list = ds_list_create();
 ds_list_read(list, base64_decode(file_text_read_string(argument0)));
 i = 0;
 global.save_room = readline();
-global.difficulty = readline();
 if(!instance_exists(oClient)){
+    global.difficulty = readline();
     global.gametime = readline();
     global.itemstaken = readline();
     global.etanks = readline();
@@ -21,6 +21,7 @@ if(!instance_exists(oClient)){
     //don't reset values
     refill_heath_ammo();
 } else if(instance_exists(oClient) && global.lastroom != gameoverroom && string_count("rm_a", room_get_name(global.lastroom)) == 0){
+    global.difficulty = readline();
     global.gametime = readline();
     global.itemstaken = readline();
     global.etanks = readline();

scripts/update_variables.gml

@@ -136,9 +136,9 @@ switch(argument0){
                         global.morphballPrev = global.morphball;
                     }
                     if(global.morphball == 1){
-                        popup_text("Morph enabled");
+                        popup_text(get_text("OptionsControlCommands", "Morph") + " " + get_text("GlobalOptions", "Enabled"));
                     } else {
-                        popup_text("Morph disabled");
+                        popup_text(get_text("OptionsControlCommands", "Morph") + " " + get_text("GlobalOptions", "Disabled"));
                     }
                 } else if(global.onlineReceived[# 2, i] == 1 && global.receivedClientID == global.clientID){
                     global.morphballPrev = global.morphball;
@@ -150,9 +150,9 @@ switch(argument0){
                         global.jumpballPrev = global.jumpball;
                     }
                     if(global.jumpball == 1){
-                        popup_text("Springball enabled");
+                        popup_text(get_text("Items", "JumpBall") + " " + get_text("GlobalOptions", "Enabled"));
                     } else {
-                        popup_text("Springball disabled");
+                        popup_text(get_text("Items", "JumpBall") + " " + get_text("GlobalOptions", "Disabled"));
                     }
                 } else if(global.onlineReceived[# 2, i] == 2 && global.receivedClientID == global.clientID){
                     global.jumpballPrev = global.jumpball;
@@ -164,9 +164,9 @@ switch(argument0){
                         global.powergripPrev = global.powergrip;
                     }
                     if(global.powergrip == 1){
-                        popup_text("Powergrip enabled");
+                        popup_text(get_text("Items", "PowerGrip") + " " + get_text("GlobalOptions", "Enabled"));
                     } else {
-                        popup_text("Powergrip disabled");
+                        popup_text(get_text("Items", "PowerGrip") + " " + get_text("GlobalOptions", "Disabled"));
                     }
                 } else if(global.onlineReceived[# 2, i] == 3 && global.receivedClientID == global.clientID){
                     global.powergripPrev = global.powergrip;
@@ -194,9 +194,9 @@ switch(argument0){
                         global.spacejumpPrev = global.spacejump;
                     }
                     if(global.spacejump == 1){
-                        popup_text("Spacejump enabled");
+                        popup_text(get_text("Items", "SpaceJump") + " " + get_text("GlobalOptions", "Enabled"));
                     } else {
-                        popup_text("Spacejump disabled");
+                        popup_text(get_text("Items", "SpaceJump") + " " + get_text("GlobalOptions", "Disabled"));
                     }
                 } else if(global.onlineReceived[# 2, i] == 4 && global.receivedClientID == global.clientID){
                     global.spacejumpPrev = global.spacejump;
@@ -224,9 +224,9 @@ switch(argument0){
                         global.screwattackPrev = global.screwattack;
                     }
                     if(global.screwattack == 1){
-                        popup_text("Screwattack enabled");
+                        popup_text(get_text("Items", "ScrewAttack") + " " + get_text("GlobalOptions", "Enabled"));
                     } else {
-                        popup_text("Screwattack disabled");
+                        popup_text(get_text("Items", "ScrewAttack") + " " + get_text("GlobalOptions", "Disabled"));
                     }
                 } else if(global.onlineReceived[# 2, i] == 5 && global.receivedClientID == global.clientID){
                     global.screwattackPrev = global.screwattack;