diff --git a/AM2R.project.gmx b/AM2R.project.gmx
index 2f0608a..e5c213b 100644
--- a/AM2R.project.gmx
+++ b/AM2R.project.gmx
@@ -1030,23 +1030,6 @@
readme.txt
-
- dictionary.json
- -1
- 4643
- 2
-
- 0
- -1
- 0
- 0
-
-
- 9223372036854775807
-
-
- dictionary.json
-
diff --git a/Configs/Default.config.gmx b/Configs/Default.config.gmx
index 80d5d63..e272448 100644
--- a/Configs/Default.config.gmx
+++ b/Configs/Default.config.gmx
@@ -21,10 +21,10 @@
false
false
True
- 23.0.1
+ 28.0.3
2
1
- 23
+ 28
AM2R
@@ -51,7 +51,7 @@
0
1
- 9
+ 14
5
0
0
@@ -65,7 +65,7 @@
lojical
com
AM2R
- 16
+ 24
false
false
@@ -77,8 +77,8 @@
4
Configs\Default\android\splash.png
0
- 23.1.1
- 23
+ 25.3.1
+ 28
1024
false
0
diff --git a/objects/oA4EscapeControl.object.gmx b/objects/oA4EscapeControl.object.gmx
index 499f176..85831bf 100644
--- a/objects/oA4EscapeControl.object.gmx
+++ b/objects/oA4EscapeControl.object.gmx
@@ -60,7 +60,9 @@ mus_current_stop();
1
if (global.ingame && room != rm_transition) {
if (temp >= 100) {
- event_user(0);
+ if(room == rm_a4b01){
+ event_user(0);
+ }
} else alarm[2] = 30;
} else alarm[2] = 1;
@@ -198,9 +200,14 @@ if (surface_exists(oControl.gui_surface)) {
if (steps > 300) {
bgw = temp / 100 * 160;
if (temp >= 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);
}
}
}
diff --git a/objects/oClient.object.gmx b/objects/oClient.object.gmx
index f38840a..dac11a3 100644
--- a/objects/oClient.object.gmx
+++ b/objects/oClient.object.gmx
@@ -26,7 +26,7 @@
1
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 && global.event[203] == 9 && instance_exists
}
}
-if(!instance_exists(oQueen)){
+if(!instance_exists(oQueen) && global.event[303] == 0){
if(!queenHealthResetQueued){
queenHealthResetQueued = true;
alarm[1] = 5;
@@ -1238,13 +1238,20 @@ if(instance_exists(oCharacter) && (oCharacter.state == oCharacter.SAVING
refill_heath_ammo();
}
+//Ensure that reloading a save doesn't disable Extreme Lab Metroids
+if(oControl.mod_monstersextremecheck == 1 && oControl.mod_monstersextreme == 0 && global.event[302] > 0){
+ oControl.mod_monstersextreme = 1;
+} else if(oControl.mod_monstersextremecheck == 0 && oControl.mod_monstersextreme == 1){
+ oControl.mod_monstersextreme = 0;
+}
+
//Sends event 309 to make sure all players can fight guardian
if(global.log[21] > 0 && global.event[309] == 0){
global.event[309] = 1;
}
if(global.event[309] == 1 && global.log[21] < 1){
- global.log[21] = 2;
+ global.log[21] = 1;
}
//End of guardian event check
@@ -1567,7 +1574,8 @@ if(instance_exists(self)){
1
- if(!global.acceptPacket) exit;
+ 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) && 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 && 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 && 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 && 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) && 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) && 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();
diff --git a/objects/oControl.object.gmx b/objects/oControl.object.gmx
index 88316e3..2fabad4 100644
--- a/objects/oControl.object.gmx
+++ b/objects/oControl.object.gmx
@@ -456,7 +456,28 @@ switch(preferredcolor){
break;
}
+MultitroidPalette = sPalMultitroidNew;
+MultitroidPaletteFusion = sPalMultitroidFusion;
+SpiderballPalette = sPalSpiderball;
+MultitroidBabyPalette = sPalMultitroidBaby;
+MultitroidIcon = sMultitroidIcon;
+MultitroidIconDark = sDarkMultitroidPlayer;
+MultitroidMapIcon = sMultitroidMapIcon;
+
global.acceptPacket = true;
+
+
+if(!file_exists(working_directory + "\dictionary.json")){
+ var jsonList = ds_list_create();
+ ds_list_read(jsonList, "2E0100000301000001000000010000007B0100000010000000092264696374696F6E617279223A207B010000000A000000092230223A203135372C010000000A000000092231223A203135382C010000000A000000092232223A203135392C010000000A000000092233223A203136302C010000000A000000092234223A203136312C010000000A000000092235223A203136322C010000000A000000092236223A203136332C010000000A000000092237223A203136342C010000000A000000092238223A203136352C010000000A000000092239223A203136362C010000000B00000009223131223A203136392C010000000C0000000922313131223A203137302C0100000008000000092265223A20312C0100000008000000092274223A20322C0100000008000000092261223A20332C010000000800000009226F223A20342C0100000008000000092269223A20352C010000000800000009226E223A20362C0100000008000000092273223A20372C0100000008000000092272223A20382C0100000008000000092268223A20392C010000000900000009226C223A2031302C0100000009000000092264223A2031312C0100000009000000092263223A2031322C0100000009000000092275223A2031332C010000000900000009226D223A2031342C0100000009000000092266223A2031352C0100000009000000092270223A2031362C0100000009000000092267223A2031372C0100000009000000092277223A2031382C0100000009000000092279223A2031392C0100000009000000092262223A2032302C0100000009000000092276223A2032312C010000000900000009226B223A2032322C0100000009000000092278223A2032332C010000000900000009226A223A2032342C0100000009000000092271223A2032352C010000000900000009227A223A2032362C010000000A00000009227468223A2032372C010000000A00000009226865223A2032382C010000000A0000000922696E223A2032392C010000000A00000009226572223A2033302C010000000A0000000922616E223A2033312C010000000A00000009227265223A2033322C010000000A00000009226F6E223A2033332C010000000A00000009226174223A2033342C010000000A0000000922656E223A2033352C010000000A00000009226E64223A2033362C010000000A00000009227469223A2033372C010000000A00000009226573223A2033382C010000000A00000009226F72223A2033392C010000000A00000009227465223A2034302C010000000A00000009226F66223A2034312C010000000A00000009226564223A2034322C010000000A00000009226973223A2034332C010000000A00000009226974223A2034342C010000000A0000000922616C223A2034352C010000000A00000009226172223A2034362C010000000A00000009227374223A2034372C010000000A0000000922746F223A2034382C010000000A00000009226E74223A2034392C010000000A00000009226E67223A2035302C010000000A00000009227365223A2035312C010000000A00000009226861223A2035322C010000000A00000009226964223A2035332C010000000A00000009226173223A2035342C010000000A00000009226F75223A2035352C010000000A0000000922696F223A2035362C010000000A00000009226C65223A2035372C010000000A00000009227665223A2035382C010000000A0000000922636F223A2035392C010000000A00000009226D65223A2036302C010000000A00000009226465223A2036312C010000000A00000009226869223A2036322C010000000A00000009227269223A2036332C010000000A0000000922726F223A2036342C010000000A00000009226963223A2036352C010000000A00000009226E65223A2036362C010000000A00000009226561223A2036372C010000000A00000009227261223A2036382C010000000A00000009226365223A2036392C010000000A00000009226C69223A2037302C010000000A00000009226368223A2037312C010000000A00000009226C6C223A2037322C010000000A00000009226265223A2037332C010000000A00000009226D61223A2037342C010000000A00000009227369223A2037352C010000000A00000009226F6D223A2037362C010000000A00000009227572223A2037372C010000000A00000009227373223A2037382C010000000B0000000922746865223A2037392C010000000B0000000922616E64223A2038302C010000000B0000000922696E67223A2038312C010000000B0000000922696F6E223A2038322C010000000B000000092274696F223A2038332C010000000B0000000922656E74223A2038342C010000000B0000000922617469223A2038352C010000000B0000000922666F72223A2038362C010000000B0000000922686572223A2038372C010000000B0000000922746572223A2038382C010000000B0000000922686174223A2038392C010000000B0000000922546865223A2039302C010000000B0000000922746861223A2039312C010000000B0000000922657265223A2039322C010000000B0000000922617465223A2039332C010000000B0000000922686973223A2039342C010000000B0000000922636F6E223A2039352C010000000B0000000922726573223A2039362C010000000B0000000922766572223A2039372C010000000B0000000922616C6C223A2039382C010000000B00000009226F6E73223A2039392C010000000C00000009226E6365223A203130302C010000000C00000009226D656E223A203130312C010000000C0000000922697468223A203130322C010000000C0000000922746564223A203130332C010000000C0000000922657273223A203130342C010000000C000000092270726F223A203130352C010000000C0000000922746869223A203130362C010000000C0000000922776974223A203130372C010000000C0000000922617265223A203130382C010000000C0000000922657373223A203130392C010000000C00000009226E6F74223A203131302C010000000C0000000922697665223A203131312C010000000C0000000922776173223A203131322C010000000C0000000922656374223A203131332C010000000C0000000922726561223A203131342C010000000C0000000922636F6D223A203131352C010000000C0000000922657665223A203131362C010000000C0000000922706572223A203131372C010000000C0000000922696E74223A203131382C010000000C0000000922657374223A203131392C010000000C0000000922737461223A203132302C010000000C0000000922637469223A203132312C010000000C0000000922696361223A203132322C010000000C0000000922697374223A203132332C010000000C0000000922656172223A203132342C010000000C000000092261696E223A203132352C010000000C00000009226F6E65223A203132362C010000000C00000009226F7572223A203132372C010000000C0000000922697469223A203132382C010000000C0000000922726174223A203132392C010000000D000000092274696F6E223A203133302C010000000D00000009226174696F223A203133312C010000000D000000092274686174223A203133322C010000000D000000092274686572223A203133332C010000000D000000092277697468223A203133342C010000000D00000009226D656E74223A203133352C010000000D0000000922696F6E73223A203133362C010000000D000000092274686973223A203133372C010000000D000000092268657265223A203133382C010000000D000000092266726F6D223A203133392C010000000D00000009226F756C64223A203134302C010000000D000000092274696E67223A203134312C010000000D000000092268696368223A203134322C010000000D000000092277686963223A203134332C010000000D00000009226374696F223A203134342C010000000D0000000922656E6365223A203134352C010000000D000000092268617665223A203134362C010000000D00000009226F746865223A203134372C010000000D000000092269676874223A203134382C010000000D000000092273696F6E223A203134392C010000000E00000009226174696F6E223A203135302C010000000E000000092274696F6E73223A203135312C010000000E00000009227768696368223A203135322C010000000E00000009226374696F6E223A203135332C010000000E00000009226F74686572223A203135342C010000000E00000009227468656972223A203135352C010000000D000000092268747470223A203135362C010000000B00000009223030223A203136372C010000000C0000000922303030223A203136382C010000000B00000009222074223A203137312C010000000B0000000922206F223A203137322C010000000B00000009222069223A203137332C010000000B00000009222073223A203137342C010000000B00000009222063223A203137352C010000000B00000009222077223A203137362C010000000B00000009222068223A203137372C010000000B00000009222062223A203137382C010000000B00000009222066223A203137392C010000000B0000000922206D223A203138302C010000000B00000009226520223A203138312C010000000B00000009227320223A203138322C010000000B00000009227420223A203138332C010000000B00000009226420223A203138342C010000000B00000009226E20223A203138352C010000000B00000009227220223A203138362C010000000B00000009227920223A203138372C010000000B00000009226620223A203138382C010000000B00000009226C20223A203138392C010000000B00000009226F20223A203139302C010000000A000000092220223A203139312C010000000A00000009222E223A203139322C010000000A00000009222C223A203139332C010000000B00000009222020223A203139342C010000000B00000009222E20223A203139352C010000000B00000009222C20223A203139362C010000000C0000000922202020223A203139372C010000000A00000009222F223A203139382C010000000B00000009225C5C223A203139392C010000000A00000009223A223A203230302C010000000A00000009227B223A203230312C010000000A00000009227D223A203230322C010000000A00000009225B223A203230332C010000000A00000009225D223A203230342C010000000B00000009225C22223A203230352C010000000C0000000922652C20223A203230362C010000000C0000000922732C20223A203230372C010000000C00000009222C2074223A203230382C010000000C00000009222C2061223A203230392C010000000C0000000922206120223A203231302C010000000C0000000922207468223A203231312C010000000C00000009226E6420223A203231322C010000000C000000092220696E223A203231332C010000000C0000000922206F66223A203231342C010000000C00000009226F6620223A203231352C010000000C00000009226F6E20223A203231362C010000000C000000092220616E223A203231372C010000000C0000000922697320223A203231382C010000000C000000092220746F223A203231392C010000000C0000000922746F20223A203232302C010000000C0000000922742074223A203232312C010000000C0000000922652074223A203232322C010000000C0000000922732074223A203232332C010000000C0000000922652061223A203232342C010000000C0000000922732061223A203232352C010000000A000000092245223A203232362C010000000A000000092254223A203232372C010000000A000000092241223A203232382C010000000A00000009224F223A203232392C010000000A000000092249223A203233302C010000000A00000009224E223A203233312C010000000A000000092253223A203233322C010000000A000000092252223A203233332C010000000A000000092248223A203233342C010000000A00000009224C223A203233352C010000000A000000092244223A203233362C010000000A000000092243223A203233372C010000000A000000092255223A203233382C010000000A00000009224D223A203233392C010000000A000000092246223A203234302C010000000A000000092250223A203234312C010000000A000000092247223A203234322C010000000A000000092257223A203234332C010000000A000000092259223A203234342C010000000A000000092242223A203234352C010000000A000000092256223A203234362C010000000A00000009224B223A203234372C010000000A000000092258223A203234382C010000000A00000009224A223A203234392C010000000A000000092251223A203235302C010000000A00000009225A223A203235312C010000000C00000009225C222C223A203235322C010000000D00000009225C223A5C22223A2032353301000000020000007D2C01000000480600000922696E765F64696374696F6E617279223A205B22222C2265222C202274222C202261222C20226F222C202269222C20226E222C202273222C202272222C202268222C20226C222C202264222C202263222C202275222C20226D222C202266222C202270222C202267222C202277222C202279222C202262222C202276222C20226B222C202278222C20226A222C202271222C20227A222C20227468222C20226865222C2022696E222C20226572222C2022616E222C20227265222C20226F6E222C20226174222C2022656E222C20226E64222C20227469222C20226573222C20226F72222C20227465222C20226F66222C20226564222C20226973222C20226974222C2022616C222C20226172222C20227374222C2022746F222C20226E74222C20226E67222C20227365222C20226861222C20226964222C20226173222C20226F75222C2022696F222C20226C65222C20227665222C2022636F222C20226D65222C20226465222C20226869222C20227269222C2022726F222C20226963222C20226E65222C20226561222C20227261222C20226365222C20226C69222C20226368222C20226C6C222C20226265222C20226D61222C20227369222C20226F6D222C20227572222C20227373222C2022746865222C2022616E64222C2022696E67222C2022696F6E222C202274696F222C2022656E74222C2022617469222C2022666F72222C2022686572222C2022746572222C2022686174222C2022546865222C2022746861222C2022657265222C2022617465222C2022686973222C2022636F6E222C2022726573222C2022766572222C2022616C6C222C20226F6E73222C20226E6365222C20226D656E222C2022697468222C2022746564222C2022657273222C202270726F222C2022746869222C2022776974222C2022617265222C2022657373222C20226E6F74222C2022697665222C2022776173222C2022656374222C2022726561222C2022636F6D222C2022657665222C2022706572222C2022696E74222C2022657374222C2022737461222C2022637469222C2022696361222C2022697374222C2022656172222C202261696E222C20226F6E65222C20226F7572222C2022697469222C2022726174222C202274696F6E222C20226174696F222C202274686174222C202274686572222C202277697468222C20226D656E74222C2022696F6E73222C202274686973222C202268657265222C202266726F6D222C20226F756C64222C202274696E67222C202268696368222C202277686963222C20226374696F222C2022656E6365222C202268617665222C20226F746865222C202269676874222C202273696F6E222C20226174696F6E222C202274696F6E73222C20227768696368222C20226374696F6E222C20226F74686572222C20227468656972222C202268747470222C202230222C202231222C202232222C202233222C202234222C202235222C202236222C202237222C202238222C202239222C20223030222C2022303030222C20223131222C2022313131222C20222074222C2022206F222C20222069222C20222073222C20222063222C20222077222C20222068222C20222062222C20222066222C2022206D222C20226520222C20227320222C20227420222C20226420222C20226E20222C20227220222C20227920222C20226620222C20226C20222C20226F20222C202220222C20222E222C20222C222C20222020222C20222E20222C20222C20222C2022202020222C20222F222C20225C5C222C20223A222C20227B222C20227D222C20225B222C20225D222C20225C22222C2022652C20222C2022732C20222C20222C2074222C20222C2061222C2022206120222C2022207468222C20226E6420222C202220696E222C2022206F66222C20226F6620222C20226F6E20222C202220616E222C2022697320222C202220746F222C2022746F20222C2022742074222C2022652074222C2022732074222C2022652061222C2022732061222C202245222C202254222C202241222C20224F222C202249222C20224E222C202253222C202252222C202248222C20224C222C202244222C202243222C202255222C20224D222C202246222C202250222C202247222C202257222C202259222C202242222C202256222C20224B222C202258222C20224A222C202251222C20225A222C20225C222C222C20225C223A5C22225D2C010000001000000009226D61785F6C656E677468223A203501000000010000007D")
+ file = file_text_open_write(working_directory + "\dictionary.json");
+ for(var i=0; i<ds_list_size(jsonList); i++){
+ file_text_write_string(file, string(jsonList[| i]));
+ file_text_writeln(file);
+ }
+ file_text_close(file);
+}
+
@@ -1429,22 +1450,24 @@ if(room == titleroom){
1
- sprite_delete(icon_merge);
-sprite_delete(icon_merge2);
-sprite_delete(icon_merge3);
-sprite_delete(icon_merge4);
-sprite_delete(icon_merge5);
-sprite_delete(icon_merge6);
-sprite_delete(icon_merge7);
-sprite_delete(icon_merge8);
-sprite_delete(icon_duplicate);
-sprite_delete(icon_duplicate2);
-sprite_delete(icon_duplicate3);
-sprite_delete(icon_duplicate4);
-sprite_delete(icon_duplicate5);
-sprite_delete(icon_duplicate6);
-sprite_delete(icon_duplicate7);
-sprite_delete(icon_duplicate8);
+ if(global.shaders_compiled){
+ sprite_delete(icon_merge);
+ sprite_delete(icon_merge2);
+ sprite_delete(icon_merge3);
+ sprite_delete(icon_merge4);
+ sprite_delete(icon_merge5);
+ sprite_delete(icon_merge6);
+ sprite_delete(icon_merge7);
+ sprite_delete(icon_merge8);
+ sprite_delete(icon_duplicate);
+ sprite_delete(icon_duplicate2);
+ sprite_delete(icon_duplicate3);
+ sprite_delete(icon_duplicate4);
+ sprite_delete(icon_duplicate5);
+ sprite_delete(icon_duplicate6);
+ sprite_delete(icon_duplicate7);
+ sprite_delete(icon_duplicate8);
+}
@@ -1513,6 +1536,10 @@ if (shaders_are_supported()) {
}
}
+if(os_type == os_android){
+ global.shaders_compiled = false;
+}
+
// DEBUG
//global.mod_gamebeaten = false;
diff --git a/objects/oMAlpha.object.gmx b/objects/oMAlpha.object.gmx
index 7236ff1..84f0767 100644
--- a/objects/oMAlpha.object.gmx
+++ b/objects/oMAlpha.object.gmx
@@ -1050,8 +1050,8 @@ if (sfx_isplaying(sndMAlphaIntro)) sfx_stop(sndMAlphaIntro);
1
-if((oControl.mod_fusion == 1) || (oControl.MonsterPalettesFusionOnly == 0 && 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);
diff --git a/objects/oMAlphaTriggerA2.object.gmx b/objects/oMAlphaTriggerA2.object.gmx
index 1e4facf..7a9db4e 100644
--- a/objects/oMAlphaTriggerA2.object.gmx
+++ b/objects/oMAlphaTriggerA2.object.gmx
@@ -231,8 +231,8 @@ instance_destroy();
1
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && 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();
diff --git a/objects/oMAlphaTriggerA3AL.object.gmx b/objects/oMAlphaTriggerA3AL.object.gmx
index 161f85b..2796648 100644
--- a/objects/oMAlphaTriggerA3AL.object.gmx
+++ b/objects/oMAlphaTriggerA3AL.object.gmx
@@ -156,8 +156,8 @@ instance_destroy();
1
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && 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();
diff --git a/objects/oMAlphaTriggerFirstCocoon.object.gmx b/objects/oMAlphaTriggerFirstCocoon.object.gmx
index e773313..7c84e7f 100644
--- a/objects/oMAlphaTriggerFirstCocoon.object.gmx
+++ b/objects/oMAlphaTriggerFirstCocoon.object.gmx
@@ -172,8 +172,8 @@ with (oControl) event_user(2);
1
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && 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();
diff --git a/objects/oMAlphaTriggerProx.object.gmx b/objects/oMAlphaTriggerProx.object.gmx
index d3662f6..d62fbd0 100644
--- a/objects/oMAlphaTriggerProx.object.gmx
+++ b/objects/oMAlphaTriggerProx.object.gmx
@@ -181,8 +181,8 @@ instance_destroy();
1
- if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && 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();
diff --git a/objects/oMGamma.object.gmx b/objects/oMGamma.object.gmx
index d4117cc..26c9031 100644
--- a/objects/oMGamma.object.gmx
+++ b/objects/oMGamma.object.gmx
@@ -1244,8 +1244,8 @@ if (sfx_isplaying(sndMAlphaIntro)) sfx_stop(sndMAlphaIntro);
1
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && 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) {
diff --git a/objects/oMGammaMutate.object.gmx b/objects/oMGammaMutate.object.gmx
index 2e98afe..a343fb0 100644
--- a/objects/oMGammaMutate.object.gmx
+++ b/objects/oMGammaMutate.object.gmx
@@ -130,8 +130,8 @@ statetime += 1;
1
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && 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);
diff --git a/objects/oMGammaTriggerProx.object.gmx b/objects/oMGammaTriggerProx.object.gmx
index 9302091..f19321d 100644
--- a/objects/oMGammaTriggerProx.object.gmx
+++ b/objects/oMGammaTriggerProx.object.gmx
@@ -205,8 +205,8 @@ legbb2y = lengthdir_y(12, currentangle + 256);
1
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && 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);
diff --git a/objects/oMOmega.object.gmx b/objects/oMOmega.object.gmx
index e7c8fcb..904ceb6 100644
--- a/objects/oMOmega.object.gmx
+++ b/objects/oMOmega.object.gmx
@@ -1784,8 +1784,8 @@ if (myhealth > 0) {
1
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && 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)) {
diff --git a/objects/oMOmegaTail.object.gmx b/objects/oMOmegaTail.object.gmx
index ae76276..eef34dd 100644
--- a/objects/oMOmegaTail.object.gmx
+++ b/objects/oMOmegaTail.object.gmx
@@ -87,8 +87,8 @@ if (timer > 9999999) timer = 0;
1
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && 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;
diff --git a/objects/oMOmegaTailMutate.object.gmx b/objects/oMOmegaTailMutate.object.gmx
index 186e65f..157f0c3 100644
--- a/objects/oMOmegaTailMutate.object.gmx
+++ b/objects/oMOmegaTailMutate.object.gmx
@@ -111,8 +111,8 @@ if (image_index == 0) {
1
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && 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);
diff --git a/objects/oMZeta.object.gmx b/objects/oMZeta.object.gmx
index 9269344..9fa8fc2 100644
--- a/objects/oMZeta.object.gmx
+++ b/objects/oMZeta.object.gmx
@@ -1627,8 +1627,8 @@ if (myhealth > 0) {
1
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && 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)) {
diff --git a/objects/oMZetaHead.object.gmx b/objects/oMZetaHead.object.gmx
index 6898b89..a714a94 100644
--- a/objects/oMZetaHead.object.gmx
+++ b/objects/oMZetaHead.object.gmx
@@ -135,8 +135,8 @@ if (other.invincible == 0) {
1
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && 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);
diff --git a/objects/oOptionsMod.object.gmx b/objects/oOptionsMod.object.gmx
index cb8c5db..3c30609 100644
--- a/objects/oOptionsMod.object.gmx
+++ b/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;
}
+
+
+
+
+
+
+
+ 1
+ 603
+ 7
+ 0
+ 0
+ -1
+ 2
+
+
+ self
+ 0
+ 0
+
+
+ 1
+ var ID = ds_map_find_value(async_load, "id");
+
+if(ID == msg && 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 && 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 && 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;
+}
@@ -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;
diff --git a/objects/oQueen.object.gmx b/objects/oQueen.object.gmx
index 1e370e0..7381616 100644
--- a/objects/oQueen.object.gmx
+++ b/objects/oQueen.object.gmx
@@ -886,8 +886,8 @@ with (leg2b_obj) instance_destroy();
1
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && 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) {
diff --git a/objects/oQueenFront.object.gmx b/objects/oQueenFront.object.gmx
index f2507f1..011becb 100644
--- a/objects/oQueenFront.object.gmx
+++ b/objects/oQueenFront.object.gmx
@@ -99,8 +99,8 @@ fxtimer = 0;
1
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && 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);
diff --git a/objects/oQueenHead.object.gmx b/objects/oQueenHead.object.gmx
index df80149..f8e879d 100644
--- a/objects/oQueenHead.object.gmx
+++ b/objects/oQueenHead.object.gmx
@@ -982,8 +982,8 @@ if (myhealth <= 0 && state != 100 && state != 50) {
1
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && 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;
diff --git a/objects/oQueenLegBack.object.gmx b/objects/oQueenLegBack.object.gmx
index ae45f90..eaa14ad 100644
--- a/objects/oQueenLegBack.object.gmx
+++ b/objects/oQueenLegBack.object.gmx
@@ -168,8 +168,8 @@ repeat (3) {
1
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && 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) {
diff --git a/objects/oQueenLegFront.object.gmx b/objects/oQueenLegFront.object.gmx
index 173ee4c..bbf7cfa 100644
--- a/objects/oQueenLegFront.object.gmx
+++ b/objects/oQueenLegFront.object.gmx
@@ -270,8 +270,8 @@ repeat (3) {
1
-if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && 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) {
diff --git a/scripts/load_resources.gml b/scripts/load_resources.gml
index 0a4c863..a08fd0b 100644
--- a/scripts/load_resources.gml
+++ b/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;
}
-
diff --git a/scripts/strict_init.gml b/scripts/strict_init.gml
index e89cfa8..b5668cf 100644
--- a/scripts/strict_init.gml
+++ b/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);
diff --git a/scripts/sv6_get_main.gml b/scripts/sv6_get_main.gml
index a057a55..04a639b 100644
--- a/scripts/sv6_get_main.gml
+++ b/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();
diff --git a/scripts/update_variables.gml b/scripts/update_variables.gml
index 59a82bf..40f0718 100644
--- a/scripts/update_variables.gml
+++ b/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;