diff --git a/objects/oClient.object.gmx b/objects/oClient.object.gmx index 1b0a4f35..bc28e390 100644 --- a/objects/oClient.object.gmx +++ b/objects/oClient.object.gmx @@ -43,6 +43,10 @@ etanksChanged = false; mtanksChanged = false; stanksChanged = false; ptanksChanged = false; +healthChanged = false; +missilesChanged = false; +smissilesChanged = false; +pbombsChanged = false; connected = false; queenHealthWait = false; queenDead = false; @@ -55,17 +59,24 @@ etanksTimer = 10; mtanksTimer = 10; stanksTimer = 10; ptanksTimer = 10; +healthTimer = 10; +missilesTimer = 10; +smissilesTimer = 10; +pbombsTimer = 10; teleportTimer = 180; disconnectTimer = 900; pingTimer = 90; resetTimer = -1; teleport = false; noName = false; +syncedDifficulty = 0; state = undefined; seed = undefined; var type; type = network_socket_tcp; +syncedDifficulty = global.difficulty; + ini_open(working_directory + "\mod_settings.ini"); ipaddress = ini_read_string("ModSettings", "ipaddress", "127.0.0.1"); name = ini_read_string("ModSettings", "displayname", "name"); @@ -1033,7 +1044,7 @@ if(metroidCountChanged){ update_variables("onlinevars"); for(var i=0; i<ds_grid_height(global.onlineList); i++){ - if(global.onlineList[# 0, i] != global.onlineList[# 1, i]){ + if(global.onlineList[# 0, i] != global.onlineList[# 1, i] && (i != 0 || i != 15 || i != 16 || i != 17)){ global.onlineSend[# 0, i] = global.onlineList[# 0, i]; global.onlineSend[# 1, i] = global.onlineList[# 1, i]; global.onlineSend[# 2, i] = global.onlineList[# 2, i]; @@ -1513,6 +1524,134 @@ if(ptanksTimer == 0 && connected){ } } +if(healthTimer == 0 && connected){ + if(global.playerhealthPrev != global.playerhealth){ + 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, 25); + buffer_write(buffer, buffer_s16, global.playerhealth); + 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, 25); + buffer_write(buffer, buffer_s16, global.playerhealth); + buffer_write(buffer, buffer_u8, global.clientID); + var result = network_send_packet(socket, buffer, buffer_tell(buffer)); + healthTimer = true; + } + + if(!healthChanged){ + healthTimer = 10; + } + + if(healthChanged){ + healthChanged = false; + healthTimer = 75; + } +} + +if(missilesTimer == 0 && connected){ + if(global.missilesPrev != global.missiles){ + 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, 26); + buffer_write(buffer, buffer_s16, global.missiles); + 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, 26); + buffer_write(buffer, buffer_s16, global.missiles); + buffer_write(buffer, buffer_u8, global.clientID); + var result = network_send_packet(socket, buffer, buffer_tell(buffer)); + missilesTimer = true; + } + + if(!missilesChanged){ + missilesTimer = 10; + } + + if(missilesChanged){ + missilesChanged = false; + missilesTimer = 75; + } +} + +if(smissilesTimer == 0 && connected){ + if(global.smissilesPrev != global.smissiles){ + 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, 27); + buffer_write(buffer, buffer_s16, global.smissiles); + 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, 27); + buffer_write(buffer, buffer_s16, global.smissiles); + buffer_write(buffer, buffer_u8, global.clientID); + var result = network_send_packet(socket, buffer, buffer_tell(buffer)); + smissilesTimer = true; + } + + if(!smissilesChanged){ + smissilesTimer = 10; + } + + if(smissilesChanged){ + smissilesChanged = false; + smissilesTimer = 75; + } +} + +if(pbombsTimer == 0 && connected){ + if(global.pbombsPrev != global.pbombs){ + 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, 28); + buffer_write(buffer, buffer_s16, global.pbombs); + 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, 28); + buffer_write(buffer, buffer_s16, global.pbombs); + buffer_write(buffer, buffer_u8, global.clientID); + var result = network_send_packet(socket, buffer, buffer_tell(buffer)); + pbombsTimer = true; + } + + if(!pbombsChanged){ + pbombsTimer = 10; + } + + if(pbombsChanged){ + pbombsChanged = false; + pbombsTimer = 75; + } +} + if(teleport){ teleportTimer--; if(teleportTimer <= 0){ @@ -1570,6 +1709,10 @@ etanksTimer--; mtanksTimer--; stanksTimer--; ptanksTimer--; +healthTimer--; +missilesTimer--; +smissilesTimer--; +pbombsTimer--; disconnectTimer--; pingTimer--; @@ -1608,6 +1751,32 @@ if(instance_exists(self)){ } } +switch(syncedDifficulty){ + case 0: + //Easy + global.difficulty = syncedDifficulty; + oControl.mod_fusion = 0; + oControl.mod_diffmult = 1; + break; + case 1: + //Normal + global.difficulty = syncedDifficulty; + oControl.mod_fusion = 0; + oControl.mod_diffmult = 1; + break; + case 2: + //Hard + global.difficulty = syncedDifficulty; + oControl.mod_fusion = 0; + oControl.mod_diffmult = 2; + break; + case 3: + //Fusion + global.difficulty = 2; + oControl.mod_fusion = 1; + oControl.mod_diffmult = 4; + break; +} @@ -2411,6 +2580,222 @@ switch(type_event){ } } break; + case 25: + var playerhealth = buffer_read(_buffer, buffer_s16); + var clientID = buffer_read(_buffer, buffer_u8); + if(clientID != global.clientID && playerhealth != global.playerhealth){ + if(instance_exists(oCharacter)){ + if(oCharacter.state != oCharacter.SAVINGFX && oCharacter.state != oCharacter.SAVINGSHIPFX && oCharacter.state != oCharacter.SAVINGSHIP && oCharacter.state != oCharacter.SAVING){ + global.playerhealthPrev = playerhealth; + global.playerhealth = playerhealth; + } else if(oCharacter.state == oCharacter.SAVINGFX || oCharacter.state == oCharacter.SAVINGSHIPFX || oCharacter.state == oCharacter.SAVINGSHIP || oCharacter.state == oCharacter.SAVING || (oCharacter.state == oCharacter.IDLE && oCharacter.juststarted > 0)){ + if(global.playerhealth != global.maxhealth){ + refill_heath_ammo(); + } + if(global.missiles != global.maxmissiles){ + refill_heath_ammo(); + } + if(global.smissiles != global.maxsmissiles){ + refill_heath_ammo(); + } + if(global.pbombs != global.maxpbombs){ + refill_heath_ammo(); + } + 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, 102); + buffer_write(buffer, buffer_s16, global.playerhealth); + buffer_write(buffer, buffer_s16, global.missiles); + buffer_write(buffer, buffer_u8, global.smissiles); + buffer_write(buffer, buffer_u8, global.pbombs); + 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, 102); + buffer_write(buffer, buffer_s16, global.playerhealth); + buffer_write(buffer, buffer_s16, global.missiles); + buffer_write(buffer, buffer_u8, global.smissiles); + buffer_write(buffer, buffer_u8, global.pbombs); + buffer_write(buffer, buffer_u8, global.clientID); + var result = network_send_packet(socket, buffer, buffer_tell(buffer)); + } + } else { + global.playerhealthPrev = playerhealth; + global.playerhealth = playerhealth; + } + } else if(clientID == global.clientID){ + global.playerhealthPrev = global.playerhealth; + } + healthTimer = 1; + break; + case 26: + var missiles = buffer_read(_buffer, buffer_s16); + var clientID = buffer_read(_buffer, buffer_u8); + if(clientID != global.clientID && missiles != global.missiles){ + if(instance_exists(oCharacter)){ + if(oCharacter.state != oCharacter.SAVINGFX && oCharacter.state != oCharacter.SAVINGSHIPFX && oCharacter.state != oCharacter.SAVINGSHIP && oCharacter.state != oCharacter.SAVING){ + global.missilesPrev = missiles; + global.missiles = missiles; + } else if(oCharacter.state == oCharacter.SAVINGFX || oCharacter.state == oCharacter.SAVINGSHIPFX || oCharacter.state == oCharacter.SAVINGSHIP || oCharacter.state == oCharacter.SAVING || (oCharacter.state == oCharacter.IDLE && oCharacter.juststarted > 0)){ + if(global.playerhealth != global.maxhealth){ + refill_heath_ammo(); + } + if(global.missiles != global.maxmissiles){ + refill_heath_ammo(); + } + if(global.smissiles != global.maxsmissiles){ + refill_heath_ammo(); + } + if(global.pbombs != global.maxpbombs){ + refill_heath_ammo(); + } + 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, 102); + buffer_write(buffer, buffer_s16, global.playerhealth); + buffer_write(buffer, buffer_s16, global.missiles); + buffer_write(buffer, buffer_u8, global.smissiles); + buffer_write(buffer, buffer_u8, global.pbombs); + 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, 102); + buffer_write(buffer, buffer_s16, global.playerhealth); + buffer_write(buffer, buffer_s16, global.missiles); + buffer_write(buffer, buffer_u8, global.smissiles); + buffer_write(buffer, buffer_u8, global.pbombs); + buffer_write(buffer, buffer_u8, global.clientID); + var result = network_send_packet(socket, buffer, buffer_tell(buffer)); + } + } else { + global.missilesPrev = missiles; + global.missiles = missiles; + } + } else if(clientID == global.clientID){ + global.missilesPrev = global.missiles; + } + missilesTimer = 1; + break; + case 27: + var smissiles = buffer_read(_buffer, buffer_s16); + var clientID = buffer_read(_buffer, buffer_u8); + if(clientID != global.clientID && smissiles != global.smissiles){ + if(instance_exists(oCharacter)){ + if(oCharacter.state != oCharacter.SAVINGFX && oCharacter.state != oCharacter.SAVINGSHIPFX && oCharacter.state != oCharacter.SAVINGSHIP && oCharacter.state != oCharacter.SAVING){ + global.smissilesPrev = smissiles; + global.smissiles = smissiles; + } else if(oCharacter.state == oCharacter.SAVINGFX || oCharacter.state == oCharacter.SAVINGSHIPFX || oCharacter.state == oCharacter.SAVINGSHIP || oCharacter.state == oCharacter.SAVING || (oCharacter.state == oCharacter.IDLE && oCharacter.juststarted > 0)){ + if(global.playerhealth != global.maxhealth){ + refill_heath_ammo(); + } + if(global.missiles != global.maxmissiles){ + refill_heath_ammo(); + } + if(global.smissiles != global.maxsmissiles){ + refill_heath_ammo(); + } + if(global.pbombs != global.maxpbombs){ + refill_heath_ammo(); + } + 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, 102); + buffer_write(buffer, buffer_s16, global.playerhealth); + buffer_write(buffer, buffer_s16, global.missiles); + buffer_write(buffer, buffer_u8, global.smissiles); + buffer_write(buffer, buffer_u8, global.pbombs); + 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, 102); + buffer_write(buffer, buffer_s16, global.playerhealth); + buffer_write(buffer, buffer_s16, global.missiles); + buffer_write(buffer, buffer_u8, global.smissiles); + buffer_write(buffer, buffer_u8, global.pbombs); + buffer_write(buffer, buffer_u8, global.clientID); + var result = network_send_packet(socket, buffer, buffer_tell(buffer)); + } + } else { + global.smissilesPrev = smissiles; + global.smissiles = smissiles; + } + } else if(clientID == global.clientID){ + global.smissilesPrev = global.smissiles; + } + smissilesTimer = 1; + break; + case 28: + var pbombs = buffer_read(_buffer, buffer_s16); + var clientID = buffer_read(_buffer, buffer_u8); + if(clientID != global.clientID && pbombs != global.pbombs){ + if(instance_exists(oCharacter)){ + if(oCharacter.state != oCharacter.SAVINGFX && oCharacter.state != oCharacter.SAVINGSHIPFX && oCharacter.state != oCharacter.SAVINGSHIP && oCharacter.state != oCharacter.SAVING){ + global.pbombsPrev = pbombs; + global.pbombs = pbombs; + } else if(oCharacter.state == oCharacter.SAVINGFX || oCharacter.state == oCharacter.SAVINGSHIPFX || oCharacter.state == oCharacter.SAVINGSHIP || oCharacter.state == oCharacter.SAVING || (oCharacter.state == oCharacter.IDLE && oCharacter.juststarted > 0)){ + if(global.playerhealth != global.maxhealth){ + refill_heath_ammo(); + } + if(global.missiles != global.maxmissiles){ + refill_heath_ammo(); + } + if(global.smissiles != global.maxsmissiles){ + refill_heath_ammo(); + } + if(global.pbombs != global.maxpbombs){ + refill_heath_ammo(); + } + 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, 102); + buffer_write(buffer, buffer_s16, global.playerhealth); + buffer_write(buffer, buffer_s16, global.missiles); + buffer_write(buffer, buffer_u8, global.smissiles); + buffer_write(buffer, buffer_u8, global.pbombs); + 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, 102); + buffer_write(buffer, buffer_s16, global.playerhealth); + buffer_write(buffer, buffer_s16, global.missiles); + buffer_write(buffer, buffer_u8, global.smissiles); + buffer_write(buffer, buffer_u8, global.pbombs); + buffer_write(buffer, buffer_u8, global.clientID); + var result = network_send_packet(socket, buffer, buffer_tell(buffer)); + } + } else { + global.pbombsPrev = pbombs; + global.pbombs = pbombs; + } + } else if(clientID == global.clientID){ + global.pbombsPrev = global.pbombs; + } + pbombsTimer = 1; + break; case 50: var resend = false; for(var i=0; i<array_length_1d(global.item); i++){ @@ -3010,9 +3395,6 @@ if(room == rm_score){ resetTimer = 5; } -if(room == titleroom){ - seed = undefined; -} @@ -3166,7 +3548,9 @@ if(instance_exists(oMapCursor)){ var arrID = arrMapIcon[0]; var arrX = arrMapIcon[1]; var arrY = arrMapIcon[2]; - draw_sprite_ext(oControl.MultitroidMapIcon, (arrID - 1), (arrX * 8), ((arrY * 8) + 32), 1, 1, direction, c_white, oMapCursor.image_alpha); + if(arrX != 3 && arrY != 3){ + draw_sprite_ext(oControl.MultitroidMapIcon, (arrID - 1), (arrX * 8), ((arrY * 8) + 32), 1, 1, direction, c_white, oMapCursor.image_alpha); + } } } } diff --git a/objects/oMissile.object.gmx b/objects/oMissile.object.gmx index 97c9025c..58b93ffc 100644 --- a/objects/oMissile.object.gmx +++ b/objects/oMissile.object.gmx @@ -131,7 +131,12 @@ if (y > global.waterlevel && global.waterlevel != 0) { } if(instance_exists(oClient)){ if(ds_list_size(oClient.roomListData) > 0){ - if (x > room_width + 200 || x < -200 || y > room_height + 200 || y < -200) instance_destroy(); + if (x > room_width + 200 || x < -200 || y > room_height + 200 || y < -200){ + instance_destroy(); + trail.speed = speed; + trail.alarm[0] = 30; + with (flame) instance_destroy(); + } } else { if (x < view_xview[0] - 48 - (oControl.widescreen_space/2)|| x > view_xview[0] + view_wview[0] + 48 + (oControl.widescreen_space/2) || y < view_yview[0] - 48 || y > view_yview[0] + view_hview[0] + 48) { instance_destroy(); diff --git a/objects/oOptionsMod.object.gmx b/objects/oOptionsMod.object.gmx index e029c580..cf169c08 100644 --- a/objects/oOptionsMod.object.gmx +++ b/objects/oOptionsMod.object.gmx @@ -38,6 +38,8 @@ num_name = tempnumcounter++; num_sequence = tempnumcounter++; num_color = tempnumcounter++; num_showname = tempnumcounter++; +num_difficulty = tempnumcounter++; +num_seedgen = tempnumcounter++; num_connection = tempnumcounter++; lastitem = tempnumcounter; // This value will be one number higher than the last number in the list above. @@ -48,6 +50,10 @@ port = string(oControl.port); showname = 1; sequence = 1; +menuDifficulty = global.difficulty; + +if(oControl.mod_fusion) menuDifficulty = 3; + connectiontxt = "Connect"; if(instance_exists(oClient)){ @@ -94,13 +100,14 @@ with (oSS_Fg) { } - tip[num_ip] = "Set the IP address of the server"; tip[num_port] = "Set the port of the server"; tip[num_name] = "Set your display name"; tip[num_sequence] = "Toggle whether the reactor sequence is synced"; tip[num_color] = "Pick your preferred player color"; tip[num_showname] = "Enable/disable showing player names"; +tip[num_difficulty] = "Choose the shared Multitroid difficulty"; +tip[num_seedgen] = "Generate a random seed for Multitroid"; tip[num_connection] = "Connect/disconnect to the server"; @@ -237,6 +244,18 @@ if (active) { event_user(2); } } + + if (global.curropt == num_difficulty && instance_exists(oClient)) + { + oClient.syncedDifficulty--; + menuDifficulty--; + if(oClient.syncedDifficulty < 0){ + oClient.syncedDifficulty = 3; + menuDifficulty = 3; + } + sfx_play(sndMenuMove); + event_user(2); + } } // End Left @@ -253,6 +272,18 @@ if (active) { event_user(2); } } + + if (global.curropt == num_difficulty && instance_exists(oClient)) + { + oClient.syncedDifficulty++; + menuDifficulty++; + if(oClient.syncedDifficulty > 3){ + oClient.syncedDifficulty = 0; + menuDifficulty = 0; + } + sfx_play(sndMenuMove); + event_user(2); + } } // End Right //End Controller @@ -547,6 +578,21 @@ switch(showname){ break; } +switch(menuDifficulty){ + case 0: + op[num_difficulty].optext = "Easy"; + break; + case 1: + op[num_difficulty].optext = "Normal"; + break; + case 2: + op[num_difficulty].optext = "Hard"; + break; + case 3: + op[num_difficulty].optext = "Fusion"; + break; +} + //if (oControl.mod_earlybaby == 1) { // op[num_baby].optext = get_text("GlobalOptions", "Enabled"); //} else op[num_baby].optext = get_text("GlobalOptions", "Disabled"); @@ -624,6 +670,14 @@ switch(showname){ break; } +if(!instance_exists(oClient)){ + op[num_difficulty].enabled = 0; + canedit[num_difficulty] = 0; +} else { + op[num_difficulty].enabled = 1; + canedit[num_difficulty] = 1; +} + ini_open(working_directory + "\mod_settings.ini"); ini_write_string("ModSettings", "ipaddress", ip); ini_write_real("ModSettings", "port", real(port)); @@ -730,6 +784,14 @@ op[num_showname] = instance_create(x, y + sep * tempcount++, oOptionLR); op[num_showname].label = "Show names"; op[num_showname].optionid = num_showname; +op[num_difficulty] = instance_create(x, y + sep * tempcount++, oOptionLR); +op[num_difficulty].label = "Difficulty"; +op[num_difficulty].optionid = num_difficulty; + +op[num_seedgen] = instance_create(x, y + sep * tempcount++, oPauseOption); +op[num_seedgen].optionid = num_seedgen; +op[num_seedgen].label = "Generate seed"; + op[num_connection] = instance_create(x, y + sep * tempcount++, oPauseOption); op[num_connection].optionid = num_connection; op[num_connection].label = connectiontxt; diff --git a/scripts/update_variables.gml b/scripts/update_variables.gml index be272031..021ee021 100644 --- a/scripts/update_variables.gml +++ b/scripts/update_variables.gml @@ -471,8 +471,8 @@ switch(argument0){ //ds_grid_set(global.onlineList, 1, 7, global.maxpbombs); //ds_grid_set(global.onlineList, 0, 8, global.maxhealthPrev); //ds_grid_set(global.onlineList, 1, 8, global.maxhealth); - ds_grid_set(global.onlineList, 0, 0, global.playerhealthPrev); - ds_grid_set(global.onlineList, 1, 0, global.playerhealth); + //ds_grid_set(global.onlineList, 0, 0, global.playerhealthPrev); + //ds_grid_set(global.onlineList, 1, 0, global.playerhealth); ds_grid_set(global.onlineList, 0, 1, global.morphballPrev); ds_grid_set(global.onlineList, 1, 1, global.morphball); ds_grid_set(global.onlineList, 0, 2, global.jumpballPrev); @@ -501,12 +501,12 @@ switch(argument0){ ds_grid_set(global.onlineList, 1, 13, global.sbeam); ds_grid_set(global.onlineList, 0, 14, global.cbeamPrev); ds_grid_set(global.onlineList, 1, 14, global.cbeam); - ds_grid_set(global.onlineList, 0, 15, global.missilesPrev); - ds_grid_set(global.onlineList, 1, 15, global.missiles); - ds_grid_set(global.onlineList, 0, 16, global.smissilesPrev); - ds_grid_set(global.onlineList, 1, 16, global.smissiles); - ds_grid_set(global.onlineList, 0, 17, global.pbombsPrev); - ds_grid_set(global.onlineList, 1, 17, global.pbombs); + //ds_grid_set(global.onlineList, 0, 15, global.missilesPrev); + //ds_grid_set(global.onlineList, 1, 15, global.missiles); + //ds_grid_set(global.onlineList, 0, 16, global.smissilesPrev); + //ds_grid_set(global.onlineList, 1, 16, global.smissiles); + //ds_grid_set(global.onlineList, 0, 17, global.pbombsPrev); + //ds_grid_set(global.onlineList, 1, 17, global.pbombs); //ds_grid_set(global.onlineList, 0, 27, global.etanksPrev); //ds_grid_set(global.onlineList, 1, 27, global.etanks); //ds_grid_set(global.onlineList, 0, 28, global.mtanksPrev); @@ -532,7 +532,7 @@ switch(argument0){ //global.maxsmissiles = ds_grid_get(global.onlineList, 1, 6); //global.maxpbombs = ds_grid_get(global.onlineList, 1, 7); //global.maxhealth = ds_grid_get(global.onlineList, 1, 8); - global.playerhealth = ds_grid_get(global.onlineList, 1, 0); + //global.playerhealth = ds_grid_get(global.onlineList, 1, 0); global.morphball = ds_grid_get(global.onlineList, 1, 1); global.jumpball = ds_grid_get(global.onlineList, 1, 2); global.powergrip = ds_grid_get(global.onlineList, 1, 3); @@ -547,9 +547,9 @@ switch(argument0){ global.pbeam = ds_grid_get(global.onlineList, 1, 12); global.sbeam = ds_grid_get(global.onlineList, 1, 13); global.cbeam = ds_grid_get(global.onlineList, 1, 14); - global.missiles = ds_grid_get(global.onlineList, 1, 15); - global.smissiles = ds_grid_get(global.onlineList, 1, 16); - global.pbombs = ds_grid_get(global.onlineList, 1, 17); + //global.missiles = ds_grid_get(global.onlineList, 1, 15); + //global.smissiles = ds_grid_get(global.onlineList, 1, 16); + //global.pbombs = ds_grid_get(global.onlineList, 1, 17); //global.etanks = ds_grid_get(global.onlineList, 1, 27); //global.mtanks = ds_grid_get(global.onlineList, 1, 28); //global.stanks = ds_grid_get(global.onlineList, 1, 29);