Revert "Slightly reduced bandwidth usage"

This reverts commit 4484435ada.
pull/28/head
milesthenerd 5 years ago
parent 5bc320c62e
commit 30a7f13b86

@ -123,19 +123,24 @@ global.roomPrev = room;
global.clientID = 0;
global.packetID = 0;
global.receivedPacketID = 0;
global.onlineList = ds_grid_create(3, 20);
global.onlineSend = ds_grid_create(3, 20);
global.onlineItem = ds_list_create();
global.onlineMetdead = ds_list_create();
global.onlineEvent = ds_list_create();
global.onlineMap = ds_list_create();
global.onlineReceived = ds_grid_create(3, 20);
global.onlineList = ds_grid_create(3, 35);
global.onlineSend = ds_grid_create(3, 35);
global.onlineItem = ds_grid_create(1, 1);
global.onlineMetdead = ds_grid_create(1, 1);
global.onlineEvent = ds_grid_create(1, 1);
global.onlineMap = ds_grid_create(1, 1);
global.onlineReceived = ds_grid_create(3, 35);
//global.storedBuffers = ds_grid_create(2, 1);
global.receivedPacketIDs = ds_list_create();
roomList = ds_list_create();
roomListData = ds_list_create();
global.idList = ds_list_create();
posData = ds_list_create();
global.hatchlingList = ds_list_create();
ds_grid_clear(global.onlineSend, -1);
ds_grid_clear(global.onlineItem, -1);
ds_grid_clear(global.onlineMetdead, -1);
ds_grid_clear(global.onlineEvent, -1);
ds_grid_clear(global.onlineReceived, -1);
for(var i=0; i<ds_grid_height(global.onlineList); i++){
ds_grid_set(global.onlineList, 2, i, i);
@ -202,10 +207,11 @@ buffer_delete(buffer);
ds_grid_destroy(global.onlineList);
ds_grid_destroy(global.onlineSend);
ds_grid_destroy(global.onlineReceived);
ds_list_destroy(global.onlineItem);
ds_list_destroy(global.onlineMetdead);
ds_list_destroy(global.onlineEvent);
ds_list_destroy(global.onlineMap);
//ds_grid_destroy(global.storedBuffers);
ds_grid_destroy(global.onlineItem);
ds_grid_destroy(global.onlineMetdead);
ds_grid_destroy(global.onlineEvent);
ds_grid_destroy(global.onlineMap);
ds_list_destroy(global.receivedPacketIDs);
ds_list_destroy(roomList);
ds_list_destroy(roomListData);
@ -493,7 +499,7 @@ if(global.ingame){
global.dmapChanges[v, 0] = global.dmap[i, f];
global.dmapChanges[v, 1] = i;
global.dmapChanges[v, 2] = f;
global.onlineMap[| 0] = global.dmapChanges;
global.onlineMap[# 0, 0] = global.dmapChanges;
mapChanged = true;
if(v == 30){
break;
@ -513,7 +519,7 @@ if(mapChanged){
buffer = buffer_create(size, type, alignment);
buffer_seek(buffer, buffer_seek_start, 0);
buffer_write(buffer, buffer_u8, 9);
buffer_write(buffer, buffer_string, strict_compress(ds_list_write(global.onlineMap)));
buffer_write(buffer, buffer_string, strict_compress(ds_grid_write(global.onlineMap)));
buffer_write(buffer, buffer_u8, global.clientID);
var result = network_send_packet(socket, buffer, buffer_tell(buffer));
}
@ -556,7 +562,7 @@ for(var f=0; f<array_length_1d(global.event); f++){
if(global.eventPrev[f] != global.event[f]){
global.eventChanges[v, 0] = global.event[f];
global.eventChanges[v, 1] = f;
global.onlineEvent[| 0] = global.eventChanges;
global.onlineEvent[# 0, 0] = global.eventChanges;
eventChanged = true;
v++;
}
@ -571,7 +577,7 @@ if(eventChanged){
buffer = buffer_create(size, type, alignment);
buffer_seek(buffer, buffer_seek_start, 0);
buffer_write(buffer, buffer_u8, 8);
buffer_write(buffer, buffer_string, strict_compress(ds_list_write(global.onlineEvent)));
buffer_write(buffer, buffer_string, strict_compress(ds_grid_write(global.onlineEvent)));
buffer_write(buffer, buffer_u8, global.clientID);
var result = network_send_packet(socket, buffer, buffer_tell(buffer));
}
@ -611,7 +617,7 @@ for(var f=0; f<array_length_1d(global.metdead); f++){
if(global.metdeadPrev[f] != global.metdead[f]){
global.metdeadChanges[v, 0] = global.metdead[f];
global.metdeadChanges[v, 1] = f;
global.onlineMetdead[| 0] = global.metdeadChanges;
global.onlineMetdead[# 0, 0] = global.metdeadChanges;
metdeadChanged = true;
v++;
}
@ -626,7 +632,7 @@ if(metdeadChanged){
buffer = buffer_create(size, type, alignment);
buffer_seek(buffer, buffer_seek_start, 0);
buffer_write(buffer, buffer_u8, 7);
buffer_write(buffer, buffer_string, strict_compress(ds_list_write(global.onlineMetdead)));
buffer_write(buffer, buffer_string, strict_compress(ds_grid_write(global.onlineMetdead)));
buffer_write(buffer, buffer_u8, global.clientID);
var result = network_send_packet(socket, buffer, buffer_tell(buffer));
}
@ -666,7 +672,7 @@ for(var f=0; f<array_length_1d(global.item); f++){
if(global.itemPrev[f] != global.item[f]){
global.itemChanges[v, 0] = global.item[f];
global.itemChanges[v, 1] = f;
global.onlineItem[| 0] = global.itemChanges;
global.onlineItem[# 0, 0] = global.itemChanges;
itemChanged = true;
v++;
}
@ -681,7 +687,7 @@ if(itemChanged){
buffer = buffer_create(size, type, alignment);
buffer_seek(buffer, buffer_seek_start, 0);
buffer_write(buffer, buffer_u8, 6);
buffer_write(buffer, buffer_string, strict_compress(ds_list_write(global.onlineItem)));
buffer_write(buffer, buffer_string, strict_compress(ds_grid_write(global.onlineItem)));
buffer_write(buffer, buffer_u8, global.clientID);
var result = network_send_packet(socket, buffer, buffer_tell(buffer));
}
@ -777,7 +783,7 @@ if(metroidCountChanged){
<argument>
<kind>1</kind>
<string>if(queenHealthResetQueued){
if(instance_exists(oQueen) &amp;&amp; instance_exists(oQueenHead) &amp;&amp; !is_undefined(oQueenHead.myhealth) &amp;&amp; !is_undefined(oQueen.phase)){
if(instance_exists(oQueen) &amp;&amp; !is_undefined(oQueenHead.myhealth) &amp;&amp; !is_undefined(oQueen.phase)){
if(global.queenhealthPrev != queenHealth){
if(queenHealth == 999999){
queenHealth = 0;
@ -881,7 +887,7 @@ if(metroidCountChanged){
update_variables("onlinevars");
for(var i=0; i&lt;ds_grid_height(global.onlineList); i++){
if(global.onlineList[# 0, i] != global.onlineList[# 1, i]){
if(global.onlineList[# 0, i] != global.onlineList[# 1, i] &amp;&amp; i != 0 &amp;&amp; i != 1 &amp;&amp; i != 3 &amp;&amp; i != 2 &amp;&amp; i != 4 &amp;&amp; i != 5 &amp;&amp; i != 6 &amp;&amp; i != 7 &amp;&amp; i != 8 &amp;&amp; i != 27 &amp;&amp; i != 28 &amp;&amp; i != 29 &amp;&amp; i != 30 &amp;&amp; i != 32){
global.onlineSend[# 0, i] = global.onlineList[# 0, i];
global.onlineSend[# 1, i] = global.onlineList[# 1, i];
global.onlineSend[# 2, i] = global.onlineList[# 2, i];
@ -962,9 +968,12 @@ if(canSend){
buffer_write(buffer, buffer_string, strict_compress(ds_grid_write(global.onlineSend)));
buffer_write(buffer, buffer_u8, global.clientID);
buffer_write(buffer, buffer_u32, global.packetID);
//global.storedBuffers[# 0, global.packetID] = global.onlineSend;
//global.storedBuffers[# 1, global.packetID] = global.clientID;
var result = network_send_packet(socket, buffer, buffer_tell(buffer));
show_debug_message("packetID = " + string(global.packetID));
global.packetID++;
//ds_grid_resize(global.storedBuffers, 2, global.packetID + 1);
ds_grid_clear(global.onlineSend, -1);
}
@ -989,7 +998,7 @@ if(instance_exists(oCharacter)){
}
}
if(instance_exists(oQueen) &amp;&amp; instance_exists(oQueenHead) &amp;&amp; !is_undefined(oQueenHead.myhealth) &amp;&amp; !is_undefined(oQueen.phase)){
if(instance_exists(oQueenHead) &amp;&amp; !is_undefined(oQueenHead.myhealth) &amp;&amp; !is_undefined(oQueen.phase)){
if(global.queenhealthPrev != oQueenHead.myhealth || oQueen.phase != phase){
show_debug_message("queen health sent " + string(oQueenHead.myhealth));
var size, type, alignment;
@ -1106,13 +1115,12 @@ if(instance_exists(oQueen) &amp;&amp; !is_undefined(oQueen.phase)){
}
queenDead = true;
}
if(instance_exists(oQueenHead)){
with(oQueenHead){
if(oQueen.phase &gt; 3 &amp;&amp; instance_exists(inst_146527)){
oQueen.phase = 3;
if(head_damage == 2){
head_damage = 1;
}
with(oQueenHead){
if(oQueen.phase &gt; 3 &amp;&amp; instance_exists(inst_146527)){
oQueen.phase = 3;
if(head_damage == 2){
head_damage = 1;
}
}
}
@ -1718,7 +1726,7 @@ switch(type_event){
phase = buffer_read(_buffer, buffer_s8);
state = buffer_read(_buffer, buffer_s8);
if(clientID != global.clientID){
if(instance_exists(oQueen) &amp;&amp; instance_exists(oQueenHead) &amp;&amp; !is_undefined(oQueenHead.myhealth) &amp;&amp; !is_undefined(oQueen.phase)){
if(instance_exists(oQueen) &amp;&amp; !is_undefined(oQueenHead.myhealth) &amp;&amp; !is_undefined(oQueen.phase)){
if(oQueen.phase == phase){
if(global.queenhealthPrev != queenHealth){
if(queenHealth == 999999){
@ -1760,7 +1768,7 @@ switch(type_event){
}
}
} else {
if(instance_exists(oQueen) &amp;&amp; instance_exists(oQueenHead) &amp;&amp; !is_undefined(oQueenHead.myhealth) &amp;&amp; !is_undefined(oQueen.phase)){
if(instance_exists(oQueen) &amp;&amp; !is_undefined(oQueenHead.myhealth) &amp;&amp; !is_undefined(oQueen.phase)){
/*
if(oQueen.phase == phase){
if(global.queenhealthPrev != queenHealth){
@ -1812,10 +1820,10 @@ switch(type_event){
alarm[2] = 10;
break;
case 7:
var item = ds_list_create();
ds_list_read(item, strict_decompress(buffer_read(_buffer, buffer_string)));
var item = ds_grid_create(1, 1);
ds_grid_read(item, strict_decompress(buffer_read(_buffer, buffer_string)));
var clientID = buffer_read(_buffer, buffer_u8);
var itemArr = item[| 0];
var itemArr = item[# 0, 0];
if(is_array(itemArr)){
for(var i=0; i&lt;array_length_1d(global.item); i++){
for(var f=0; f&lt;array_height_2d(itemArr); f++){
@ -1830,16 +1838,16 @@ switch(type_event){
}
alarm[3] = 10;
if(global.clientID == clientID){
ds_list_clear(global.onlineItem);
ds_grid_clear(global.onlineItem, -1);
global.itemChanges = 0;
}
ds_list_destroy(item);
ds_grid_destroy(item);
break;
case 8:
var metdead = ds_list_create();
ds_list_read(metdead, strict_decompress(buffer_read(_buffer, buffer_string)));
var metdead = ds_grid_create(1, 1);
ds_grid_read(metdead, strict_decompress(buffer_read(_buffer, buffer_string)));
var clientID = buffer_read(_buffer, buffer_u8);
var metdeadArr = metdead[| 0];
var metdeadArr = metdead[# 0, 0];
if(is_array(metdeadArr)){
for(var i=0; i&lt;array_length_1d(global.metdead); i++){
for(var f=0; f&lt;array_height_2d(metdeadArr); f++){
@ -1854,16 +1862,16 @@ switch(type_event){
}
alarm[4] = 10;
if(global.clientID == clientID){
ds_list_clear(global.onlineMetdead);
ds_grid_clear(global.onlineMetdead, -1);
global.metdeadChanges = 0;
}
ds_list_destroy(metdead);
ds_grid_destroy(metdead);
break;
case 9:
var event = ds_list_create();
ds_list_read(event, strict_decompress(buffer_read(_buffer, buffer_string)));
var event = ds_grid_create(1, 1);
ds_grid_read(event, strict_decompress(buffer_read(_buffer, buffer_string)));
var clientID = buffer_read(_buffer, buffer_u8);
var eventArr = event[| 0];
var eventArr = event[# 0, 0];
if(is_array(eventArr)){
for(var i=0; i&lt;array_length_1d(global.event); i++){
for(var f=0; f&lt;array_height_2d(eventArr); f++){
@ -1914,16 +1922,16 @@ switch(type_event){
}
alarm[5] = 10;
if(global.clientID == clientID){
ds_list_clear(global.onlineEvent);
ds_grid_clear(global.onlineEvent, -1);
global.eventChanges = 0;
}
ds_list_destroy(event);
ds_grid_destroy(event);
break;
case 10:
var dmap = ds_list_create();
ds_list_read(dmap, strict_decompress(buffer_read(_buffer, buffer_string)));
var dmap = ds_grid_create(1, 1);
ds_grid_read(dmap, strict_decompress(buffer_read(_buffer, buffer_string)));
var clientID = buffer_read(_buffer, buffer_u8);
var dmapArr = dmap[| 0];
var dmapArr = dmap[# 0, 0];
if(is_array(dmapArr)){
for(var i=0; i&lt;array_height_2d(global.dmap); i++){
for(var f=0; f&lt;array_length_2d(global.dmap, i); f++){
@ -1943,10 +1951,10 @@ switch(type_event){
}
alarm[6] = 10;
if(global.clientID == clientID){
ds_list_clear(global.onlineMap);
ds_grid_clear(global.onlineMap, -1);
global.dmapChanges = 0;
}
ds_list_destroy(dmap);
ds_grid_destroy(dmap);
break;
case 11:
var itemstaken = buffer_read(_buffer, buffer_u8);
@ -2096,10 +2104,6 @@ switch(type_event){
buffer_write(buffer, buffer_u8, global.clientID);
var result = network_send_packet(socket, buffer, buffer_tell(buffer));
}
if(room == titleroom){
seed = undefined;
}
</string>
</argument>
</arguments>
@ -2140,10 +2144,11 @@ buffer_delete(buffer);
ds_grid_destroy(global.onlineList);
ds_grid_destroy(global.onlineSend);
ds_grid_destroy(global.onlineReceived);
ds_list_destroy(global.onlineItem);
ds_list_destroy(global.onlineMetdead);
ds_list_destroy(global.onlineEvent);
ds_list_destroy(global.onlineMap);
//ds_grid_destroy(global.storedBuffers);
ds_grid_destroy(global.onlineItem);
ds_grid_destroy(global.onlineMetdead);
ds_grid_destroy(global.onlineEvent);
ds_grid_destroy(global.onlineMap);
ds_list_destroy(global.receivedPacketIDs);
ds_list_destroy(roomList);
ds_list_destroy(roomListData);

@ -40,7 +40,7 @@ switch(argument0){
case "updateprev":
for(var i=0; i<ds_grid_height(global.onlineReceived); i++){
if(global.onlineReceived[# 2, i] != -1){
if(global.onlineReceived[# 2, i] == 15 && global.receivedClientID != global.clientID){
if(global.onlineReceived[# 2, i] == 24 && global.receivedClientID != global.clientID){
if(instance_exists(oCharacter)){
if(oCharacter.state != oCharacter.SAVINGFX && oCharacter.state != oCharacter.SAVINGSHIPFX && oCharacter.state != oCharacter.SAVINGSHIP && oCharacter.state != oCharacter.SAVING){
global.missiles = global.onlineReceived[# 1, i];
@ -51,11 +51,11 @@ switch(argument0){
if(global.missilesPrev != global.missiles){
global.missilesPrev = global.missiles;
}
} else if(global.onlineReceived[# 2, i] == 15 && global.receivedClientID == global.clientID){
} else if(global.onlineReceived[# 2, i] == 24 && global.receivedClientID == global.clientID){
global.missilesPrev = global.missiles;
}
if(global.onlineReceived[# 2, i] == 16 && global.receivedClientID != global.clientID){
if(global.onlineReceived[# 2, i] == 25 && global.receivedClientID != global.clientID){
if(instance_exists(oCharacter)){
if(oCharacter.state != oCharacter.SAVINGFX && oCharacter.state != oCharacter.SAVINGSHIPFX && oCharacter.state != oCharacter.SAVINGSHIP && oCharacter.state != oCharacter.SAVING){
global.smissiles = global.onlineReceived[# 1, i];
@ -66,7 +66,7 @@ switch(argument0){
if(global.smissilesPrev != global.smissiles){
global.smissilesPrev = global.smissiles;
}
} else if(global.onlineReceived[# 2, i] == 16 && global.receivedClientID == global.clientID){
} else if(global.onlineReceived[# 2, i] == 25 && global.receivedClientID == global.clientID){
global.smissilesPrev = global.smissiles;
}
/*
@ -115,7 +115,7 @@ switch(argument0){
global.maxhealthPrev = global.maxhealth;
}
*/
if(global.onlineReceived[# 2, i] == 0 && global.receivedClientID != global.clientID){
if(global.onlineReceived[# 2, i] == 9 && global.receivedClientID != global.clientID){
if(instance_exists(oCharacter)){
if(oCharacter.state != oCharacter.SAVINGFX && oCharacter.state != oCharacter.SAVINGSHIPFX && oCharacter.state != oCharacter.SAVINGSHIP && oCharacter.state != oCharacter.SAVING){
global.playerhealth = global.onlineReceived[# 1, i];
@ -126,11 +126,11 @@ switch(argument0){
if(global.playerhealthPrev != global.playerhealth){
global.playerhealthPrev = global.playerhealth;
}
} else if(global.onlineReceived[# 2, i] == 0 && global.receivedClientID == global.clientID){
} else if(global.onlineReceived[# 2, i] == 9 && global.receivedClientID == global.clientID){
global.playerhealthPrev = global.playerhealth;
}
if(global.onlineReceived[# 2, i] == 1 && global.receivedClientID != global.clientID){
if(global.onlineReceived[# 2, i] == 10 && global.receivedClientID != global.clientID){
global.morphball = global.onlineReceived[# 1, i];
if(global.morphballPrev != global.morphball){
global.morphballPrev = global.morphball;
@ -140,11 +140,11 @@ switch(argument0){
} else {
popup_text("Morph disabled");
}
} else if(global.onlineReceived[# 2, i] == 1 && global.receivedClientID == global.clientID){
} else if(global.onlineReceived[# 2, i] == 10 && global.receivedClientID == global.clientID){
global.morphballPrev = global.morphball;
}
if(global.onlineReceived[# 2, i] == 2 && global.receivedClientID != global.clientID){
if(global.onlineReceived[# 2, i] == 11 && global.receivedClientID != global.clientID){
global.jumpball = global.onlineReceived[# 1, i];
if(global.jumpballPrev != global.jumpball){
global.jumpballPrev = global.jumpball;
@ -154,11 +154,11 @@ switch(argument0){
} else {
popup_text("Springball disabled");
}
} else if(global.onlineReceived[# 2, i] == 2 && global.receivedClientID == global.clientID){
} else if(global.onlineReceived[# 2, i] == 11 && global.receivedClientID == global.clientID){
global.jumpballPrev = global.jumpball;
}
if(global.onlineReceived[# 2, i] == 3 && global.receivedClientID != global.clientID){
if(global.onlineReceived[# 2, i] == 12 && global.receivedClientID != global.clientID){
global.powergrip = global.onlineReceived[# 1, i];
if(global.powergripPrev != global.powergrip){
global.powergripPrev = global.powergrip;
@ -168,11 +168,11 @@ switch(argument0){
} else {
popup_text("Powergrip disabled");
}
} else if(global.onlineReceived[# 2, i] == 3 && global.receivedClientID == global.clientID){
} else if(global.onlineReceived[# 2, i] == 12 && global.receivedClientID == global.clientID){
global.powergripPrev = global.powergrip;
}
if(global.onlineReceived[# 2, i] == 4 && global.receivedClientID != global.clientID){
if(global.onlineReceived[# 2, i] == 13 && global.receivedClientID != global.clientID){
global.spacejump = global.onlineReceived[# 1, i];
if(sfx_isplaying(sndSpinJump)){
sfx_stop(sndSpinJump);
@ -198,11 +198,11 @@ switch(argument0){
} else {
popup_text("Spacejump disabled");
}
} else if(global.onlineReceived[# 2, i] == 4 && global.receivedClientID == global.clientID){
} else if(global.onlineReceived[# 2, i] == 13 && global.receivedClientID == global.clientID){
global.spacejumpPrev = global.spacejump;
}
if(global.onlineReceived[# 2, i] == 5 && global.receivedClientID != global.clientID){
if(global.onlineReceived[# 2, i] == 14 && global.receivedClientID != global.clientID){
global.screwattack = global.onlineReceived[# 1, i];
if(sfx_isplaying(sndSpinJump)){
sfx_stop(sndSpinJump);
@ -228,11 +228,11 @@ switch(argument0){
} else {
popup_text("Screwattack disabled");
}
} else if(global.onlineReceived[# 2, i] == 5 && global.receivedClientID == global.clientID){
} else if(global.onlineReceived[# 2, i] == 14 && global.receivedClientID == global.clientID){
global.screwattackPrev = global.screwattack;
}
if(global.onlineReceived[# 2, i] == 6 && global.receivedClientID != global.clientID){
if(global.onlineReceived[# 2, i] == 15 && global.receivedClientID != global.clientID){
global.hijump = global.onlineReceived[# 1, i];
if(global.hijumpPrev != global.hijump){
global.hijumpPrev = global.hijump;
@ -242,11 +242,11 @@ switch(argument0){
} else {
popup_text("Hi jump disabled");
}
} else if(global.onlineReceived[# 2, i] == 6 && global.receivedClientID == global.clientID){
} else if(global.onlineReceived[# 2, i] == 15 && global.receivedClientID == global.clientID){
global.hijumpPrev = global.hijump;
}
if(global.onlineReceived[# 2, i] == 7 && global.receivedClientID != global.clientID){
if(global.onlineReceived[# 2, i] == 16 && global.receivedClientID != global.clientID){
global.spiderball = global.onlineReceived[# 1, i];
if(global.spiderballPrev != global.spiderball){
global.spiderballPrev = global.spiderball;
@ -256,11 +256,11 @@ switch(argument0){
} else {
popup_text("Spiderball disabled");
}
} else if(global.onlineReceived[# 2, i] == 7 && global.receivedClientID == global.clientID){
} else if(global.onlineReceived[# 2, i] == 16 && global.receivedClientID == global.clientID){
global.spiderballPrev = global.spiderball;
}
if(global.onlineReceived[# 2, i] == 8 && global.receivedClientID != global.clientID){
if(global.onlineReceived[# 2, i] == 17 && global.receivedClientID != global.clientID){
global.speedbooster = global.onlineReceived[# 1, i];
if(global.speedboosterPrev != global.speedbooster){
global.speedboosterPrev = global.speedbooster;
@ -270,11 +270,11 @@ switch(argument0){
} else {
popup_text("Speedbooster disabled");
}
} else if(global.onlineReceived[# 2, i] == 8 && global.receivedClientID == global.clientID){
} else if(global.onlineReceived[# 2, i] == 17 && global.receivedClientID == global.clientID){
global.speedboosterPrev = global.speedbooster;
}
if(global.onlineReceived[# 2, i] == 9 && global.receivedClientID != global.clientID){
if(global.onlineReceived[# 2, i] == 18 && global.receivedClientID != global.clientID){
global.bomb = global.onlineReceived[# 1, i];
if(global.bombPrev != global.bomb){
global.bombPrev = global.bomb;
@ -284,11 +284,11 @@ switch(argument0){
} else {
popup_text("Bombs disabled");
}
} else if(global.onlineReceived[# 2, i] == 9 && global.receivedClientID == global.clientID){
} else if(global.onlineReceived[# 2, i] == 18 && global.receivedClientID == global.clientID){
global.bombPrev = global.bomb;
}
if(global.onlineReceived[# 2, i] == 10 && global.receivedClientID != global.clientID){
if(global.onlineReceived[# 2, i] == 19 && global.receivedClientID != global.clientID){
global.ibeam = global.onlineReceived[# 1, i];
if(global.ibeamPrev != global.ibeam){
global.ibeamPrev = global.ibeam;
@ -298,11 +298,11 @@ switch(argument0){
} else {
popup_text("Ice beam disabled");
}
} else if(global.onlineReceived[# 2, i] == 10 && global.receivedClientID == global.clientID){
} else if(global.onlineReceived[# 2, i] == 19 && global.receivedClientID == global.clientID){
global.ibeamPrev = global.ibeam;
}
if(global.onlineReceived[# 2, i] == 11 && global.receivedClientID != global.clientID){
if(global.onlineReceived[# 2, i] == 20 && global.receivedClientID != global.clientID){
global.wbeam = global.onlineReceived[# 1, i];
if(global.wbeamPrev != global.wbeam){
global.wbeamPrev = global.wbeam;
@ -312,11 +312,11 @@ switch(argument0){
} else {
popup_text("Wave beam disabled");
}
} else if(global.onlineReceived[# 2, i] == 11 && global.receivedClientID == global.clientID){
} else if(global.onlineReceived[# 2, i] == 20 && global.receivedClientID == global.clientID){
global.wbeamPrev = global.wbeam;
}
if(global.onlineReceived[# 2, i] == 12 && global.receivedClientID != global.clientID){
if(global.onlineReceived[# 2, i] == 21 && global.receivedClientID != global.clientID){
global.pbeam = global.onlineReceived[# 1, i];
if(global.pbeamPrev != global.pbeam){
global.pbeamPrev = global.pbeam;
@ -326,11 +326,11 @@ switch(argument0){
} else {
popup_text("Plasma beam disabled");
}
} else if(global.onlineReceived[# 2, i] == 12 && global.receivedClientID == global.clientID){
} else if(global.onlineReceived[# 2, i] == 21 && global.receivedClientID == global.clientID){
global.pbeamPrev = global.pbeam;
}
if(global.onlineReceived[# 2, i] == 13 && global.receivedClientID != global.clientID){
if(global.onlineReceived[# 2, i] == 22 && global.receivedClientID != global.clientID){
global.sbeam = global.onlineReceived[# 1, i];
if(global.sbeamPrev != global.sbeam){
global.sbeamPrev = global.sbeam;
@ -340,11 +340,11 @@ switch(argument0){
} else {
popup_text("Spazer beam disabled");
}
} else if(global.onlineReceived[# 2, i] == 13 && global.receivedClientID == global.clientID){
} else if(global.onlineReceived[# 2, i] == 22 && global.receivedClientID == global.clientID){
global.sbeamPrev = global.sbeam;
}
if(global.onlineReceived[# 2, i] == 14 && global.receivedClientID != global.clientID){
if(global.onlineReceived[# 2, i] == 23 && global.receivedClientID != global.clientID){
global.cbeam = global.onlineReceived[# 1, i];
if(global.cbeamPrev != global.cbeam){
global.cbeamPrev = global.cbeam;
@ -354,11 +354,11 @@ switch(argument0){
} else {
popup_text("Charge beam disabled");
}
} else if(global.onlineReceived[# 2, i] == 14 && global.receivedClientID == global.clientID){
} else if(global.onlineReceived[# 2, i] == 23 && global.receivedClientID == global.clientID){
global.cbeamPrev = global.cbeam;
}
if(global.onlineReceived[# 2, i] == 17 && global.receivedClientID != global.clientID){
if(global.onlineReceived[# 2, i] == 26 && global.receivedClientID != global.clientID){
if(instance_exists(oCharacter)){
if(oCharacter.state != oCharacter.SAVINGFX && oCharacter.state != oCharacter.SAVINGSHIPFX && oCharacter.state != oCharacter.SAVINGSHIP && oCharacter.state != oCharacter.SAVING){
global.pbombs = global.onlineReceived[# 1, i];
@ -369,7 +369,7 @@ switch(argument0){
if(global.pbombsPrev != global.pbombs){
global.pbombsPrev = global.pbombs;
}
} else if(global.onlineReceived[# 2, i] == 17 && global.receivedClientID == global.clientID){
} else if(global.onlineReceived[# 2, i] == 26 && global.receivedClientID == global.clientID){
global.pbombsPrev = global.pbombs;
}
/*
@ -409,7 +409,7 @@ switch(argument0){
global.ptanksPrev = global.ptanks;
}
*/
if(global.onlineReceived[# 2, i] == 18 && global.receivedClientID != global.clientID){
if(global.onlineReceived[# 2, i] == 31 && global.receivedClientID != global.clientID){
global.currentsuit = global.onlineReceived[# 1, i];
if(global.currentsuitPrev != global.currentsuit){
global.currentsuitPrev = global.currentsuit;
@ -421,7 +421,7 @@ switch(argument0){
} else if(global.currentsuit == 0){
popup_text("Power suit enabled");
}
} else if(global.onlineReceived[# 2, i] == 18 && global.receivedClientID == global.clientID){
} else if(global.onlineReceived[# 2, i] == 31 && global.receivedClientID == global.clientID){
global.currentsuitPrev = global.currentsuit;
}
}
@ -446,42 +446,42 @@ 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, 1, global.morphballPrev);
ds_grid_set(global.onlineList, 1, 1, global.morphball);
ds_grid_set(global.onlineList, 0, 2, global.jumpballPrev);
ds_grid_set(global.onlineList, 1, 2, global.jumpball);
ds_grid_set(global.onlineList, 0, 3, global.powergripPrev);
ds_grid_set(global.onlineList, 1, 3, global.powergrip);
ds_grid_set(global.onlineList, 0, 4, global.spacejumpPrev);
ds_grid_set(global.onlineList, 1, 4, global.spacejump);
ds_grid_set(global.onlineList, 0, 5, global.screwattackPrev);
ds_grid_set(global.onlineList, 1, 5, global.screwattack);
ds_grid_set(global.onlineList, 0, 6, global.hijumpPrev);
ds_grid_set(global.onlineList, 1, 6, global.hijump);
ds_grid_set(global.onlineList, 0, 7, global.spiderballPrev);
ds_grid_set(global.onlineList, 1, 7, global.spiderball);
ds_grid_set(global.onlineList, 0, 8, global.speedboosterPrev);
ds_grid_set(global.onlineList, 1, 8, global.speedbooster);
ds_grid_set(global.onlineList, 0, 9, global.bombPrev);
ds_grid_set(global.onlineList, 1, 9, global.bomb);
ds_grid_set(global.onlineList, 0, 10, global.ibeamPrev);
ds_grid_set(global.onlineList, 1, 10, global.ibeam);
ds_grid_set(global.onlineList, 0, 11, global.wbeamPrev);
ds_grid_set(global.onlineList, 1, 11, global.wbeam);
ds_grid_set(global.onlineList, 0, 12, global.pbeamPrev);
ds_grid_set(global.onlineList, 1, 12, global.pbeam);
ds_grid_set(global.onlineList, 0, 13, global.sbeamPrev);
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, 9, global.playerhealthPrev);
ds_grid_set(global.onlineList, 1, 9, global.playerhealth);
ds_grid_set(global.onlineList, 0, 10, global.morphballPrev);
ds_grid_set(global.onlineList, 1, 10, global.morphball);
ds_grid_set(global.onlineList, 0, 11, global.jumpballPrev);
ds_grid_set(global.onlineList, 1, 11, global.jumpball);
ds_grid_set(global.onlineList, 0, 12, global.powergripPrev);
ds_grid_set(global.onlineList, 1, 12, global.powergrip);
ds_grid_set(global.onlineList, 0, 13, global.spacejumpPrev);
ds_grid_set(global.onlineList, 1, 13, global.spacejump);
ds_grid_set(global.onlineList, 0, 14, global.screwattackPrev);
ds_grid_set(global.onlineList, 1, 14, global.screwattack);
ds_grid_set(global.onlineList, 0, 15, global.hijumpPrev);
ds_grid_set(global.onlineList, 1, 15, global.hijump);
ds_grid_set(global.onlineList, 0, 16, global.spiderballPrev);
ds_grid_set(global.onlineList, 1, 16, global.spiderball);
ds_grid_set(global.onlineList, 0, 17, global.speedboosterPrev);
ds_grid_set(global.onlineList, 1, 17, global.speedbooster);
ds_grid_set(global.onlineList, 0, 18, global.bombPrev);
ds_grid_set(global.onlineList, 1, 18, global.bomb);
ds_grid_set(global.onlineList, 0, 19, global.ibeamPrev);
ds_grid_set(global.onlineList, 1, 19, global.ibeam);
ds_grid_set(global.onlineList, 0, 20, global.wbeamPrev);
ds_grid_set(global.onlineList, 1, 20, global.wbeam);
ds_grid_set(global.onlineList, 0, 21, global.pbeamPrev);
ds_grid_set(global.onlineList, 1, 21, global.pbeam);
ds_grid_set(global.onlineList, 0, 22, global.sbeamPrev);
ds_grid_set(global.onlineList, 1, 22, global.sbeam);
ds_grid_set(global.onlineList, 0, 23, global.cbeamPrev);
ds_grid_set(global.onlineList, 1, 23, global.cbeam);
ds_grid_set(global.onlineList, 0, 24, global.missilesPrev);
ds_grid_set(global.onlineList, 1, 24, global.missiles);
ds_grid_set(global.onlineList, 0, 25, global.smissilesPrev);
ds_grid_set(global.onlineList, 1, 25, global.smissiles);
ds_grid_set(global.onlineList, 0, 26, global.pbombsPrev);
ds_grid_set(global.onlineList, 1, 26, 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);
@ -490,12 +490,12 @@ switch(argument0){
//ds_grid_set(global.onlineList, 1, 29, global.stanks);
//ds_grid_set(global.onlineList, 0, 30, global.ptanksPrev);
//ds_grid_set(global.onlineList, 1, 30, global.ptanks);
ds_grid_set(global.onlineList, 0, 18, global.currentsuitPrev);
ds_grid_set(global.onlineList, 1, 18, global.currentsuit);
ds_grid_set(global.onlineList, 0, 31, global.currentsuitPrev);
ds_grid_set(global.onlineList, 1, 31, global.currentsuit);
//ds_grid_set(global.onlineList, 0, 32, global.monstersareaPrev);
//ds_grid_set(global.onlineList, 1, 32, global.monstersarea);
ds_grid_set(global.onlineList, 0, 19, global.lavastatePrev);
ds_grid_set(global.onlineList, 1, 19, global.lavastate);
ds_grid_set(global.onlineList, 0, 33, global.lavastatePrev);
ds_grid_set(global.onlineList, 1, 33, global.lavastate);
break;
case "replaceglobalvars":
//global.item = ds_grid_get(global.onlineList, 1, 0);
@ -507,39 +507,39 @@ 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.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);
global.spacejump = ds_grid_get(global.onlineList, 1, 4);
global.screwattack = ds_grid_get(global.onlineList, 1, 5);
global.hijump = ds_grid_get(global.onlineList, 1, 6);
global.spiderball = ds_grid_get(global.onlineList, 1, 7);
global.speedbooster = ds_grid_get(global.onlineList, 1, 8);
global.bomb = ds_grid_get(global.onlineList, 1, 9);
global.ibeam = ds_grid_get(global.onlineList, 1, 10);
global.wbeam = ds_grid_get(global.onlineList, 1, 11);
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.playerhealth = ds_grid_get(global.onlineList, 1, 9);
global.morphball = ds_grid_get(global.onlineList, 1, 10);
global.jumpball = ds_grid_get(global.onlineList, 1, 11);
global.powergrip = ds_grid_get(global.onlineList, 1, 12);
global.spacejump = ds_grid_get(global.onlineList, 1, 13);
global.screwattack = ds_grid_get(global.onlineList, 1, 14);
global.hijump = ds_grid_get(global.onlineList, 1, 15);
global.spiderball = ds_grid_get(global.onlineList, 1, 16);
global.speedbooster = ds_grid_get(global.onlineList, 1, 17);
global.bomb = ds_grid_get(global.onlineList, 1, 18);
global.ibeam = ds_grid_get(global.onlineList, 1, 19);
global.wbeam = ds_grid_get(global.onlineList, 1, 20);
global.pbeam = ds_grid_get(global.onlineList, 1, 21);
global.sbeam = ds_grid_get(global.onlineList, 1, 22);
global.cbeam = ds_grid_get(global.onlineList, 1, 23);
global.missiles = ds_grid_get(global.onlineList, 1, 24);
global.smissiles = ds_grid_get(global.onlineList, 1, 25);
global.pbombs = ds_grid_get(global.onlineList, 1, 26);
//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);
//global.ptanks = ds_grid_get(global.onlineList, 1, 30);
global.currentsuit = ds_grid_get(global.onlineList, 1, 18);
global.currentsuit = ds_grid_get(global.onlineList, 1, 31);
//global.monstersarea = ds_grid_get(global.onlineList, 1, 32);
global.lavastate = ds_grid_get(global.onlineList, 1, 19);
global.lavastate = ds_grid_get(global.onlineList, 1, 33);
break;
case "disablesame":
for(var i=0; i<ds_grid_height(global.onlineReceived); i++){
if(global.onlineReceived[# 2, i] != -1 && i != 0 && i != 15 && i != 16 && i != 17){
if(global.onlineReceived[# 2, i] != -1 && i != 0 && i != 1 && i != 3 && i != 9 && i != 24 && i != 25 && i != 26){
global.onlineList[# 1, i] = global.onlineReceived[# 1, i];
}
if(global.onlineReceived[# 2, i] != -1 && (i == 0 || i == 15 || i == 16 || i == 17)){
if(global.onlineReceived[# 2, i] != -1 && (i == 9 || i == 24 || i == 25 || i == 26)){
if(instance_exists(oCharacter)){
if(oCharacter.state != oCharacter.SAVINGFX && oCharacter.state != oCharacter.SAVINGSHIPFX && oCharacter.state != oCharacter.SAVINGSHIP && oCharacter.state != oCharacter.SAVING){
global.onlineList[# 1, i] = global.onlineReceived[# 1, i];
@ -580,9 +580,9 @@ switch(argument0){
}
}
if(i == 19){
if(i == 33){
if(global.onlineReceived[# 2, i] != -1 && global.receivedClientID != global.clientID){
global.lavastate = global.onlineReceived[# 1, i];
global.lavastate = global.onlineReceived[# 1, 33];
if(global.lavastatePrev != global.lavastate){
global.lavastatePrev = global.lavastate;
}

Loading…
Cancel
Save