diff --git a/objects/oA4EscapeControl.object.gmx b/objects/oA4EscapeControl.object.gmx index 85831bf6..6948a571 100644 --- a/objects/oA4EscapeControl.object.gmx +++ b/objects/oA4EscapeControl.object.gmx @@ -204,10 +204,13 @@ if (surface_exists(oControl.gui_surface)) { 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); + if(room != rm_a4b01){ + with (oA4EscapeSeqFX) instance_destroy(); + sfx_stop_loops(); + global.event[203] = 9; + instance_destroy(); + popup_text_ext("Reactor destroyed", 240); + } } } } @@ -292,7 +295,8 @@ instance_destroy(); 1 - + + diff --git a/objects/oArachnus.object.gmx b/objects/oArachnus.object.gmx index 35115880..b7bdb4d7 100644 --- a/objects/oArachnus.object.gmx +++ b/objects/oArachnus.object.gmx @@ -76,6 +76,8 @@ sprite_index = sArachnusUnmorph; event_user(1); PowerBombImmune = false; + +dead = false; @@ -606,7 +608,7 @@ if (state == 90) { myhealth -= 1; shaking = 1; angry = 0; - if (myhealth == 0) { + if (myhealth <= 0) { with(oArachnusFireball3) instance_destroy(); alarm[10] = 60; alarm[11] = 240; @@ -629,7 +631,7 @@ if (state == 90) { with (spike_L2) active = 0; with (spike_R2) active = 0; } - if (myhealth == 0) { + if (myhealth <= 0) { with (spike_L1) active = 0; with (spike_R1) active = 0; hspeed = 2.5 * -facing; @@ -661,6 +663,13 @@ if (PowerBombImmune) { if(!instance_exists(oPBombExpl)) PowerBombImmune = false; } +if(global.event[103] > 0 && !dead){ + myhealth = 0; + state = 90; + statetime = -1; + dead = true; + with(oArachnusSpikes) instance_destroy(); +} diff --git a/objects/oBoss1Head.object.gmx b/objects/oBoss1Head.object.gmx index 87faf560..77fbada2 100644 --- a/objects/oBoss1Head.object.gmx +++ b/objects/oBoss1Head.object.gmx @@ -63,6 +63,8 @@ wall2.image_yscale = 3; wheel = instance_create(x, y, oBoss1Wheel); sparkcounter = 0; + +dead = false; @@ -358,6 +360,21 @@ if (fxtimer < 5) { fxtimer += 1; } else fxtimer = 0; if (flashing > 0) flashing -= 1; + +if(global.event[51] > 0 && !dead){ + state = 100; + sfx_play(sndBoss1Death); + with (wall1) instance_destroy(); + with (wall2) instance_destroy(); + with (wheel) instance_destroy(); + with (block1) event_user(0); + with (block2) event_user(0); + with (inst_107511) instance_destroy(); + mus_fadeout(musAncientGuardian); + oMusicV2.bossbgm = sndJump; + mus_current_fadein(); + dead = true; +} diff --git a/objects/oClient.object.gmx b/objects/oClient.object.gmx index dac11a3f..ef0e5866 100644 --- a/objects/oClient.object.gmx +++ b/objects/oClient.object.gmx @@ -58,6 +58,7 @@ ptanksTimer = 10; teleportTimer = 180; disconnectTimer = 900; pingTimer = 90; +resetTimer = -1; teleport = false; noName = false; state = undefined; @@ -185,6 +186,8 @@ posY = 3; time = 60; trail = 0; + +get_loadout(5); @@ -639,7 +642,7 @@ if(mapChanged){ 1 var v = 0; for(var f=0; f<array_length_1d(global.event); f++){ - if(f > 350){ + if(f > 350 || f == 102){ break; } if(global.eventPrev[f] != global.event[f]){ @@ -1511,6 +1514,25 @@ if(pingTimer <= 0){ var result = network_send_packet(socket, buffer, buffer_tell(buffer)); } +if(resetTimer == 0){ + buffer_delete(buffer); + var size, type, alignment; + size = 1024; + type = buffer_grow; + alignment = 1; + buffer = buffer_create(size, type, alignment); + buffer_seek(buffer, buffer_seek_start, 0); + buffer_write(buffer, buffer_u8, 20); + buffer_write(buffer, buffer_u8, global.clientID); + var bufferSize = buffer_tell(buffer); + buffer_seek(buffer, buffer_seek_start, 0); + buffer_write(buffer, buffer_s32, bufferSize); + buffer_write(buffer, buffer_u8, 20); + buffer_write(buffer, buffer_u8, global.clientID); + var result = network_send_packet(socket, buffer, buffer_tell(buffer)); + show_debug_message("it sent why doesn't this work pls"); +} + time--; maxpbombsTimer--; maxhealthTimer--; @@ -1521,6 +1543,10 @@ ptanksTimer--; disconnectTimer--; pingTimer--; +if(resetTimer > -1){ + resetTimer--; +} + if(instance_exists(self)){ if(ds_list_size(roomListData) > 0){ for(var h=0; h<ds_list_size(roomListData); h++){ @@ -1830,6 +1856,11 @@ switch(type_event){ case 106: load_character_vars(); reset_dmap(); + global.itemPrev = array_clone(global.item); + global.metdeadPrev = array_clone(global.metdead); + global.eventPrev = array_clone(global.event); + global.dmapPrev = array_clone(global.dmap); + popup_text("Stats reset"); break; case 0: global.clientID = buffer_read(_buffer, buffer_u8); @@ -2044,7 +2075,7 @@ switch(type_event){ if(is_array(eventArr)){ for(var i=0; i<array_length_1d(global.event); i++){ for(var f=0; f<array_height_2d(eventArr); f++){ - if(i == eventArr[f, 1]){ + if(i == eventArr[f, 1] && eventArr[f, 1] != 102){ global.eventPrev[i] = eventArr[f, 0]; if(global.event[i] != eventArr[f, 0]){ global.event[i] = eventArr[f, 0]; @@ -2282,37 +2313,37 @@ switch(type_event){ if(i == 0){ global.bomb = 1; global.bombPrev = global.bomb; - popup_text("Bombs enabled"); + popup_text(get_text("Items", "Bombs") + " " + get_text("GlobalOptions", "Enabled")); } if(i == 1){ global.powergrip = 1; global.powergripPrev = global.powergrip; - popup_text("Powergrip enabled"); + popup_text(get_text("Items", "PowerGrip") + " " + get_text("GlobalOptions", "Enabled")); } if(i == 2){ global.spiderball = 1; global.spiderballPrev = global.spiderball; - popup_text("Spiderball enabled"); + popup_text(get_text("Items", "SpiderBall") + " " + get_text("GlobalOptions", "Enabled")); } if(i == 3){ global.jumpball = 1; global.jumpballPrev = global.jumpball; - popup_text("Springball enabled"); + popup_text(get_text("Items", "JumpBall") + " " + get_text("GlobalOptions", "Enabled")); } if(i == 4){ global.hijump = 1; global.hijumpPrev = global.hijump; - popup_text("Hi jump enabled"); + popup_text(get_text("Items", "HiJump") + " " + get_text("GlobalOptions", "Enabled")); } if(i == 5){ global.currentsuit = 1; global.currentsuitPrev = global.currentsuit; - popup_text("Varia suit enabled"); + popup_text(get_text("Items", "VariaSuit") + " " + get_text("GlobalOptions", "Enabled")); if(sfx_isplaying(sndSpinJump)){ sfx_stop(sndSpinJump); } @@ -2333,7 +2364,7 @@ switch(type_event){ if(i == 6){ global.spacejump = 1; global.spacejumpPrev = global.spacejump; - popup_text("Spacejump enabled"); + popup_text(get_text("Items", "SpaceJump") + " " + get_text("GlobalOptions", "Enabled")); if(sfx_isplaying(sndSpinJump)){ sfx_stop(sndSpinJump); } @@ -2354,13 +2385,13 @@ switch(type_event){ if(i == 7){ global.speedbooster = 1; global.speedboosterPrev = global.speedbooster; - popup_text("Speedbooster enabled"); + popup_text(get_text("Items", "SpeedBooster") + " " + get_text("GlobalOptions", "Enabled")); } if(i == 8){ global.screwattack = 1; global.screwattackPrev = global.screwattack; - popup_text("Screwattack enabled"); + popup_text(get_text("Items", "ScrewAttack") + " " + get_text("GlobalOptions", "Enabled")); if(sfx_isplaying(sndSpinJump)){ sfx_stop(sndSpinJump); } @@ -2381,7 +2412,7 @@ switch(type_event){ if(i == 9){ global.currentsuit = 2; global.currentsuitPrev = global.currentsuit; - popup_text("Gravity suit enabled"); + popup_text(get_text("Items", "GravitySuit") + " " + get_text("GlobalOptions", "Enabled")); if(sfx_isplaying(sndSpinJump)){ sfx_stop(sndSpinJump); } @@ -2402,31 +2433,31 @@ switch(type_event){ if(i == 10){ global.cbeam = 1; global.cbeamPrev = global.cbeam; - popup_text("Charge beam enabled"); + popup_text(get_text("Items", "ChargeBeam") + " " + get_text("GlobalOptions", "Enabled")); } if(i == 11){ global.ibeam = 1; global.ibeamPrev = global.ibeam; - popup_text("Ice beam enabled"); + popup_text(get_text("Items", "IceBeam") + " " + get_text("GlobalOptions", "Enabled")); } if(i == 12){ global.wbeam = 1; global.wbeamPrev = global.wbeam; - popup_text("Wave beam enabled"); + popup_text(get_text("Items", "WaveBeam") + " " + get_text("GlobalOptions", "Enabled")); } if(i == 13){ global.sbeam = 1; global.sbeamPrev = global.sbeam; - popup_text("Spazer beam enabled"); + popup_text(get_text("Items", "SpazerBeam") + " " + get_text("GlobalOptions", "Enabled")); } if(i == 14){ global.pbeam = 1; global.pbeamPrev = global.pbeam; - popup_text("Plasma beam enabled"); + popup_text(get_text("Items", "PlasmaBeam") + " " + get_text("GlobalOptions", "Enabled")); } } else if(receivedItem == 0 && global.item[i] == 1){ resend = true; @@ -2519,10 +2550,10 @@ switch(type_event){ for(var i=0; i<array_length_1d(global.event); i++){ if(i < 350){ var receivedEvent = buffer_read(_buffer, buffer_u8); - if(floor(receivedEvent) > floor(global.event[i])){ + if(floor(receivedEvent) > floor(global.event[i]) && i != 102){ global.event[i] = receivedEvent; global.eventPrev[i] = global.event[i]; - } else if(floor(receivedEvent) < floor(global.event[i])){ + } else if(floor(receivedEvent) < floor(global.event[i]) && i != 102){ resend = true; } } @@ -2797,6 +2828,10 @@ switch(type_event){ var result = network_send_packet(socket, buffer, buffer_tell(buffer)); } +if(room == rm_score){ + resetTimer = 5; +} + if(room == titleroom){ seed = undefined; } diff --git a/objects/oControl.object.gmx b/objects/oControl.object.gmx index 2fabad42..7f53c7e5 100644 --- a/objects/oControl.object.gmx +++ b/objects/oControl.object.gmx @@ -548,6 +548,28 @@ alarm[11] = 1; + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + + + + + 1 diff --git a/objects/oEris.object.gmx b/objects/oEris.object.gmx index d7fd7624..7c3dbf24 100644 --- a/objects/oEris.object.gmx +++ b/objects/oEris.object.gmx @@ -95,7 +95,7 @@ boostspddelay = 1; stepdelayfinal = stepdelay; use2 = 0; - +dead = false; @@ -559,6 +559,12 @@ if (use2) { event_user(2); use2 = 0; } + +if(global.event[261] > 0 && !dead){ + state = 100; + statetime = -1; + dead = true; +} diff --git a/objects/oGenesis.object.gmx b/objects/oGenesis.object.gmx index 4afce59d..3129f85a 100644 --- a/objects/oGenesis.object.gmx +++ b/objects/oGenesis.object.gmx @@ -45,6 +45,8 @@ damage = global.mod_genesisDamage; turning = 0; turnframe = 0; scan_log(38, get_text("ScanEvents", "ScanBioform"), 180, 0); + +dead = false; @@ -364,6 +366,12 @@ if (turning) { } } statetime += 1; + +if(global.event[307] > 0 && !dead){ + hp = 0; + event_user(1); + dead = true; +} diff --git a/objects/oOptionsMod.object.gmx b/objects/oOptionsMod.object.gmx index 3c306099..e029c580 100644 --- a/objects/oOptionsMod.object.gmx +++ b/objects/oOptionsMod.object.gmx @@ -270,9 +270,14 @@ if (active) { event_user(2); } + var key; + if(os_type != os_android){ + key = keyboard_check_pressed(vk_enter); + } else { + key = (oControl.kMenu1 > 0); + } - - if (keyboard_check_pressed(vk_space) && oControl.kMenu1PushedSteps == 0) { + if (key && oControl.kMenu1PushedSteps == 0) { if (global.curropt == num_ip && os_type != os_android) { editing = !editing; op[num_ip].editing = editing; @@ -318,6 +323,9 @@ if (active) { editing = !editing; op[num_name].editing = editing; } + } // if (oControl.kMenu1 && oControl.kMenu1PushedSteps == 0) + + if (oControl.kMenu1 && oControl.kMenu1PushedSteps == 0){ if (global.curropt == num_connection){ if(!instance_exists(oClient) && global.canConnect){ instance_create(x, y, oClient); @@ -341,7 +349,7 @@ if (active) { instance_destroy(); sfx_play(sndMenuSel); } - } // if (oControl.kMenu1 && oControl.kMenu1PushedSteps == 0) + } /* if (oControl.kMenu2 && oControl.kMenu1PushedSteps == 0) { diff --git a/objects/oScoreScreen.object.gmx b/objects/oScoreScreen.object.gmx index 0841ab8f..eadf98eb 100644 --- a/objects/oScoreScreen.object.gmx +++ b/objects/oScoreScreen.object.gmx @@ -60,6 +60,7 @@ text4 = get_text("ScoreScreen", "TheLastMonster"); text5 = get_text("ScoreScreen", "ToBeContinued"); statetime = 0; state = 0; +itemstaken = global.itemstaken; if (global.difficulty == 0) { ending = 276; @@ -201,7 +202,7 @@ statetime += 1; 1 //room_change(titleroom, 1); //room_goto(titleroom); -if(round((global.itemstaken / 88) * 100) < 100) { +if(round((itemstaken / 88) * 100) < 100) { room_change(titleroom, 1); //room_goto(titleroom); } else { room_goto(rm_secretEnding); diff --git a/objects/oTankCore.object.gmx b/objects/oTankCore.object.gmx index c60aa4ea..251a0e3d 100644 --- a/objects/oTankCore.object.gmx +++ b/objects/oTankCore.object.gmx @@ -31,6 +31,31 @@ myhealth = global.mod_tankHcore; image_speed = 1/10; shaking = 0; flashing = 0; + +dead = false; + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + with (oTankShield) instance_destroy(); @@ -54,6 +79,11 @@ flashing = 0; 1 if (flashing > 0) flashing -= 1; + +if(global.event[203] != 1 && !dead){ + event_user(1); + dead = true; +} diff --git a/objects/oTester.object.gmx b/objects/oTester.object.gmx index 04d7ee23..4e0b26f5 100644 --- a/objects/oTester.object.gmx +++ b/objects/oTester.object.gmx @@ -78,6 +78,8 @@ movespeed = 1; directrotate = 0; aim_x = 0; aim_y = 0; + +dead = false; @@ -635,7 +637,17 @@ if (state != 100) { if (flashing > 0) flashing -= 1; statetime += 1; - +if(global.event[200] > 1 && !dead){ + make_explosion3(x, y); + repeat (30) instance_create(x, y, oDebris); + state = 100; + statetime = -1; + alarm[10] = 1; + alarm[11] = 300; + with (oTesterShield) event_user(1); + visible = false; + dead = true; +} diff --git a/objects/oTorizo.object.gmx b/objects/oTorizo.object.gmx index 9aad1be5..509f5f2e 100644 --- a/objects/oTorizo.object.gmx +++ b/objects/oTorizo.object.gmx @@ -58,6 +58,8 @@ walkspeed = 0.3; image_index_last = 0; proj_damage = 0; scan_log(34, get_text("ScanEvents", "ScanMechanism"), 180, 0); + +dead = false; @@ -614,6 +616,19 @@ if (fxtimer < 5) { } else fxtimer = 0; if (flashing > 0) flashing -= 1; dist = distance_to_point(oCharacter.x, oCharacter.y - 20); + +if(global.event[152] >= 2 && !dead){ + flashing = 5; + fxtimer = 0; + PlaySoundMono(sndTorizoHit); + state = 100; + statetime = -1; + alarm[10] = 1; + alarm[11] = 300; + mus_fadeout(musTorizoA); + oMusicV2.bossbgm = sndJump; + dead = true; +} @@ -839,6 +854,7 @@ if (myhealth <= 0) { alarm[11] = 300; mus_fadeout(musTorizoA); oMusicV2.bossbgm = sndJump; + global.event[152] = 2; } diff --git a/objects/oTorizo2.object.gmx b/objects/oTorizo2.object.gmx index 16590616..c13c4c66 100644 --- a/objects/oTorizo2.object.gmx +++ b/objects/oTorizo2.object.gmx @@ -76,6 +76,8 @@ repeat (18) { i += 1; } wings = instance_create(x, y - 65, oTorizoWings); + +dead = false; @@ -562,6 +564,24 @@ if (fxtimer < 5) { } else fxtimer = 0; if (flashing > 0) flashing -= 1; dist = distance_to_point(oCharacter.x, oCharacter.y - 20); + +if(global.event[152] >= 3 && !dead){ + flashing = 5; + fxtimer = 0; + PlaySoundMono(sndTorizoHit); + state = 100; + statetime = -1; + alarm[10] = 1; + alarm[11] = 300; + with (oTorizoEgg) event_user(1); + with (oTorizoGhost) event_user(1); + if(oControl.mod_fusion == 0) { + with (oTorizoSpikes) event_user(0); + mus_fadeout(musTorizoB); + oMusicV2.bossbgm = sndJump; + } + dead = true; +} @@ -765,6 +785,7 @@ if (myhealth <= 0) { mus_fadeout(musTorizoB); oMusicV2.bossbgm = sndJump; } + global.event[152] = 3; } diff --git a/rooms/rm_a6a06.room.gmx b/rooms/rm_a6a06.room.gmx index 5ef22247..8a8104e1 100644 --- a/rooms/rm_a6a06.room.gmx +++ b/rooms/rm_a6a06.room.gmx @@ -17,8 +17,8 @@ global.waterlevel = 0; global.watertype = 0; if (global.lavastate == 8) { make_liquid(1, 680, 0, 0, 0, 0, 0); -} else if (global.lavastate == 9) make_liquid(1, 160, 0, 0, 0, 0, 0); -if (global.lavastate >= 9) { +} else if (global.lavastate == 9 && !instance_exists(oClient)) make_liquid(1, 160, 0, 0, 0, 0, 0); +if (global.lavastate >= 9 && !instance_exists(oClient)) { tile_layer_shift(-101, -32, 48); tile_layer_shift(-102, -32, 48); } @@ -72,14 +72,14 @@ if (global.lavastate < 10) tile_layer_delete(-99); - + - - + + @@ -96,7 +96,7 @@ if (global.lavastate < 10) tile_layer_delete(-99); - + @@ -110,15 +110,15 @@ if (global.lavastate < 10) tile_layer_delete(-99); - - - - - - - - - + + + + + + + + + @@ -140,8 +140,8 @@ if (global.lavastate < 10) tile_layer_delete(-99); - - + + diff --git a/rooms/rm_a6a07.room.gmx b/rooms/rm_a6a07.room.gmx index 5917c111..838f19b1 100644 --- a/rooms/rm_a6a07.room.gmx +++ b/rooms/rm_a6a07.room.gmx @@ -14,7 +14,7 @@ global.mapoffsety = 52; global.waterlevel = 0; global.floormaterial = 1; -if (global.lavastate == 9) make_liquid(1, 400, 0, 0, 0, 0, 0); +if (global.lavastate == 9 && !instance_exists(oClient)) make_liquid(1, 400, 0, 0, 0, 0, 0); -1 -1 0 diff --git a/rooms/rm_a6a12.room.gmx b/rooms/rm_a6a12.room.gmx index 22b988c6..dd3c3580 100644 --- a/rooms/rm_a6a12.room.gmx +++ b/rooms/rm_a6a12.room.gmx @@ -15,11 +15,11 @@ global.mapoffsety = 55; global.floormaterial = 1; global.waterlevel = 0; global.watertype = 0; -if (global.lavastate <= 8) { +if (global.lavastate <= 9) { make_liquid(1, 200, 0, 0, 0, 0, 0); tile_layer_delete(-98); } -if (global.lavastate > 8) tile_layer_delete(-99); +if (global.lavastate > 9) tile_layer_delete(-99); -1 -1 0 @@ -239,7 +239,7 @@ if (global.lavastate > 8) tile_layer_delete(-99); - + @@ -263,7 +263,7 @@ if (global.lavastate > 8) tile_layer_delete(-99); - + diff --git a/scripts/draw_character.gml b/scripts/draw_character.gml index 4de55385..afa8e942 100644 --- a/scripts/draw_character.gml +++ b/scripts/draw_character.gml @@ -1,6 +1,6 @@ /// draw_character(sprite, x, y, sprite2, s2ox, s2oy, sprite3, s3ox, s3oy, s3angle, facing, color, alpha, s3show) -if(global.shaders_compiled){ +if(shader_is_compiled(shd_pal_swapper)){ if ((oControl.mod_fusion) && (!oControl.msr_fusionsuit)) { // Fusion suit if (global.currentsuit == 0) { // Power pal_swap_set(sPalFusion0, 1, false); diff --git a/scripts/update_variables.gml b/scripts/update_variables.gml index 40f07188..09a11f77 100644 --- a/scripts/update_variables.gml +++ b/scripts/update_variables.gml @@ -238,9 +238,9 @@ switch(argument0){ global.hijumpPrev = global.hijump; } if(global.hijump == 1){ - popup_text("Hi jump enabled"); + popup_text(get_text("Items", "HiJump") + " " + get_text("GlobalOptions", "Enabled")); } else { - popup_text("Hi jump disabled"); + popup_text(get_text("Items", "HiJump") + " " + get_text("GlobalOptions", "Disabled")); } } else if(global.onlineReceived[# 2, i] == 6 && global.receivedClientID == global.clientID){ global.hijumpPrev = global.hijump; @@ -252,9 +252,9 @@ switch(argument0){ global.spiderballPrev = global.spiderball; } if(global.spiderball == 1){ - popup_text("Spiderball enabled"); + popup_text(get_text("Items", "SpiderBall") + " " + get_text("GlobalOptions", "Enabled")); } else { - popup_text("Spiderball disabled"); + popup_text(get_text("Items", "SpiderBall") + " " + get_text("GlobalOptions", "Disabled")); } } else if(global.onlineReceived[# 2, i] == 7 && global.receivedClientID == global.clientID){ global.spiderballPrev = global.spiderball; @@ -266,9 +266,9 @@ switch(argument0){ global.speedboosterPrev = global.speedbooster; } if(global.speedbooster == 1){ - popup_text("Speedbooster enabled"); + popup_text(get_text("Items", "SpeedBooster") + " " + get_text("GlobalOptions", "Enabled")); } else { - popup_text("Speedbooster disabled"); + popup_text(get_text("Items", "SpeedBooster") + " " + get_text("GlobalOptions", "Disabled")); } } else if(global.onlineReceived[# 2, i] == 8 && global.receivedClientID == global.clientID){ global.speedboosterPrev = global.speedbooster; @@ -280,9 +280,9 @@ switch(argument0){ global.bombPrev = global.bomb; } if(global.bomb == 1){ - popup_text("Bombs enabled"); + popup_text(get_text("Items", "Bombs") + " " + get_text("GlobalOptions", "Enabled")); } else { - popup_text("Bombs disabled"); + popup_text(get_text("Items", "Bombs") + " " + get_text("GlobalOptions", "Disabled")); } } else if(global.onlineReceived[# 2, i] == 9 && global.receivedClientID == global.clientID){ global.bombPrev = global.bomb; @@ -294,9 +294,9 @@ switch(argument0){ global.ibeamPrev = global.ibeam; } if(global.ibeam == 1){ - popup_text("Ice beam enabled"); + popup_text(get_text("Items", "IceBeam") + " " + get_text("GlobalOptions", "Enabled")); } else { - popup_text("Ice beam disabled"); + popup_text(get_text("Items", "IceBeam") + " " + get_text("GlobalOptions", "Disabled")); } } else if(global.onlineReceived[# 2, i] == 10 && global.receivedClientID == global.clientID){ global.ibeamPrev = global.ibeam; @@ -308,9 +308,9 @@ switch(argument0){ global.wbeamPrev = global.wbeam; } if(global.wbeam == 1){ - popup_text("Wave beam enabled"); + popup_text(get_text("Items", "WaveBeam") + " " + get_text("GlobalOptions", "Enabled")); } else { - popup_text("Wave beam disabled"); + popup_text(get_text("Items", "WaveBeam") + " " + get_text("GlobalOptions", "Disabled")); } } else if(global.onlineReceived[# 2, i] == 11 && global.receivedClientID == global.clientID){ global.wbeamPrev = global.wbeam; @@ -322,9 +322,9 @@ switch(argument0){ global.pbeamPrev = global.pbeam; } if(global.pbeam == 1){ - popup_text("Plasma beam enabled"); + popup_text(get_text("Items", "PlasmaBeam") + " " + get_text("GlobalOptions", "Enabled")); } else { - popup_text("Plasma beam disabled"); + popup_text(get_text("Items", "PlasmaBeam") + " " + get_text("GlobalOptions", "Disabled")); } } else if(global.onlineReceived[# 2, i] == 12 && global.receivedClientID == global.clientID){ global.pbeamPrev = global.pbeam; @@ -336,9 +336,9 @@ switch(argument0){ global.sbeamPrev = global.sbeam; } if(global.sbeam == 1){ - popup_text("Spazer beam enabled"); + popup_text(get_text("Items", "SpazerBeam") + " " + get_text("GlobalOptions", "Enabled")); } else { - popup_text("Spazer beam disabled"); + popup_text(get_text("Items", "SpazerBeam") + " " + get_text("GlobalOptions", "Disabled")); } } else if(global.onlineReceived[# 2, i] == 13 && global.receivedClientID == global.clientID){ global.sbeamPrev = global.sbeam; @@ -350,9 +350,9 @@ switch(argument0){ global.cbeamPrev = global.cbeam; } if(global.cbeam == 1){ - popup_text("Charge beam enabled"); + popup_text(get_text("Items", "ChargeBeam") + " " + get_text("GlobalOptions", "Enabled")); } else { - popup_text("Charge beam disabled"); + popup_text(get_text("Items", "ChargeBeam") + " " + get_text("GlobalOptions", "Disabled")); } } else if(global.onlineReceived[# 2, i] == 14 && global.receivedClientID == global.clientID){ global.cbeamPrev = global.cbeam; @@ -431,11 +431,11 @@ switch(argument0){ global.currentsuitPrev = global.currentsuit; } if(global.currentsuit == 2){ - popup_text("Gravity suit enabled"); + popup_text(get_text("Items", "GravitySuit") + " " + get_text("GlobalOptions", "Enabled")); } else if(global.currentsuit == 1){ - popup_text("Varia suit enabled"); + popup_text(get_text("Items", "VariaSuit") + " " + get_text("GlobalOptions", "Enabled")); } else if(global.currentsuit == 0){ - popup_text("Power suit enabled"); + popup_text(get_text("ItemsMenu", "PowerSuit") + " " + get_text("GlobalOptions", "Enabled")); } } else if(global.onlineReceived[# 2, i] == 18 && global.receivedClientID == global.clientID){ global.currentsuitPrev = global.currentsuit;