AM2R-Mod-Sources
/
AM2R-Multitroid
mirror of https://github.com/milesthenerd/AM2R-Multitroid
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Commit before further breaking something

Browse Source
pull/28/head
milesthenerd 6 years ago
parent 54775141d6
commit af0ad3f4a2
6 changed files with 100 additions and 65 deletions
Show Stats Download Patch File Download Diff File

9
objects/oA7QueenSoundLoop.object.gmx
Unescape View File

@ -48,10 +48,13 @@
<arguments>
<argument>
<kind>1</kind>
<string>if (instance_exists(oCharacter)) {
if (oCharacter.x &lt; 1000) sfx_play(sndQueenDistant);
<string>if(global.event[303] == 0){
if (instance_exists(oCharacter)) {
if (oCharacter.x &lt; 1000) sfx_play(sndQueenDistant);
}
alarm[0] = 400 + random(160);
}
alarm[0] = 400 + random(160);
</string>
</argument>
</arguments>

50
objects/oClient.object.gmx
Unescape View File

@ -158,7 +158,6 @@ global.onlineMetdead = ds_list_create();
global.onlineEvent = ds_list_create();
global.onlineMap = ds_list_create();
global.onlineReceived = ds_grid_create(3, 20);
global.receivedPacketIDs = ds_list_create();
roomList = ds_list_create();
roomListData = ds_list_create();
global.idList = ds_list_create();
@ -236,7 +235,6 @@ if(!noName){
ds_list_destroy(global.onlineMetdead);
ds_list_destroy(global.onlineEvent);
ds_list_destroy(global.onlineMap);
ds_list_destroy(global.receivedPacketIDs);
ds_list_destroy(roomList);
ds_list_destroy(roomListData);
ds_list_destroy(global.idList);
@ -952,7 +950,7 @@ if(canSend){
if(instance_exists(oCharacter)){
check_areaclear();
if(global.playerhealth &lt;= 0){
if(oCharacter.state != oCharacter.DEFEATED){
if(oCharacter.state != oCharacter.DEFEATED &amp;&amp; oCharacter.canbehit){
oCharacter.alarm[0] = 6;
oCharacter.state = oCharacter.DEFEATED;
mus_current_fadeout();
@ -1024,7 +1022,10 @@ if(itemCount != global.itemstaken){
buffer = buffer_create(size, type, alignment);
buffer_seek(buffer, buffer_seek_start, 0);
buffer_write(buffer, buffer_u8, 1);
buffer_write(buffer, buffer_string, name)
buffer_write(buffer, buffer_string, name);
var bufferSize = buffer_get_size(buffer);
buffer_seek(buffer, buffer_seek_start, 0);
buffer_write(buffer, buffer_s32, bufferSize);
var result = network_send_packet(socket, buffer, buffer_tell(buffer));
instance_create(x, y, oNametag);
} else {
@ -1096,6 +1097,10 @@ if(keyboard_check_pressed(vk_f2)){
if(keyboard_check_pressed(vk_f3)){
popup_text_ext(string(oControl.seed), 300);
global.event[303] = 1;
global.targetx = 864;
global.targety = 96;
room_change(rm_a7c01, 1);
}
if(keyboard_check_pressed(vk_f4)){
@ -1414,7 +1419,8 @@ if(instance_exists(self)){
<arguments>
<argument>
<kind>1</kind>
<string>
<string>if(!global.acceptPacket) exit;
var type_event = ds_map_find_value(async_load, "type");
switch(type_event){
@ -1695,9 +1701,6 @@ switch(type_event){
case 1:
ds_grid_read(global.onlineReceived, strict_decompress(buffer_read(_buffer, buffer_string)));
global.receivedClientID = buffer_read(_buffer, buffer_u8);
if(global.receivedClientID == global.clientID){
global.receivedPacketIDs[| global.receivedPacketID] = buffer_read(_buffer, buffer_u32);
}
global.receivedPacketID++;
if(global.receivedClientID != global.clientID){
update_variables("disablesame");
@ -2592,21 +2595,22 @@ if(room == titleroom){
var result = network_send_packet(socket, buffer, buffer_tell(buffer));
}
network_destroy(socket);
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_list_destroy(global.receivedPacketIDs);
ds_list_destroy(roomList);
ds_list_destroy(roomListData);
ds_list_destroy(global.idList);
ds_list_destroy(posData);
ds_list_destroy(global.hatchlingList);
if(!noName){
network_destroy(socket);
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_list_destroy(roomList);
ds_list_destroy(roomListData);
ds_list_destroy(global.idList);
ds_list_destroy(posData);
ds_list_destroy(global.hatchlingList);
}
</string>
</argument>
</arguments>

43
objects/oControl.object.gmx
Unescape View File

@ -455,6 +455,8 @@ switch(preferredcolor){
preferredcolor = 9;
break;
}
global.acceptPacket = true;
</string>
</argument>
</arguments>
@ -548,6 +550,29 @@ if (!global.opfullscreen) {
global.opscale = 1;
alarm[1] = 1;
}
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="2" enumb="3">
<action>
<libid>1</libid>
<id>603</id>
<kind>7</kind>
<userelative>0</userelative>
<isquestion>0</isquestion>
<useapplyto>-1</useapplyto>
<exetype>2</exetype>
<functionname></functionname>
<codestring></codestring>
<whoName>self</whoName>
<relative>0</relative>
<isnot>0</isnot>
<arguments>
<argument>
<kind>1</kind>
<string>global.acceptPacket = true;
</string>
</argument>
</arguments>
@ -1404,7 +1429,23 @@ if(room == titleroom){
<arguments>
<argument>
<kind>1</kind>
<string></string>
<string>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);
</string>
</argument>
</arguments>
</action>

2
scripts/characterStepEvent.gml
Unescape View File

@ -892,7 +892,9 @@ if (state == SAVINGSHIP) {
statetime = 0;
}
} else {
global.enablecontrol = 0;
if (statetime == 5){
global.enablecontrol = 0;
global.event[308] = 1;
}
if (statetime == 120) {

52
scripts/load_resources.gml
Unescape View File

@ -302,24 +302,24 @@ if (file_exists("mods/palettes/multitroid/multitroid_fusion.png")) oControl.Mult
if (file_exists("mods/palettes/multitroid/spiderball.png")) oControl.SpiderballPalette = sprite_add("mods/palettes/multitroid/spiderball.png", 1, false, false, 0, 0);
if (file_exists("mods/palettes/multitroid/baby_metroid.png")) oControl.MultitroidBabyPalette = sprite_add("mods/palettes/multitroid/baby_metroid.png", 1, false, false, 0, 0);
var icon_sprite = 0;
var icon_merge = 1;
var icon_merge2 = 2;
var icon_merge3 = 3;
var icon_merge4 = 4;
var icon_merge5 = 5;
var icon_merge6 = 6;
var icon_merge7 = 7;
var icon_merge8 = 8;
var icon_duplicate = 9;
var icon_duplicate2 = 10;
var icon_duplicate3 = 11;
var icon_duplicate4 = 12;
var icon_duplicate5 = 13;
var icon_duplicate6 = 14;
var icon_duplicate7 = 15;
var icon_duplicate8 = 16;
var i = 0;
icon_sprite = 0;
icon_merge = 1;
icon_merge2 = 2;
icon_merge3 = 3;
icon_merge4 = 4;
icon_merge5 = 5;
icon_merge6 = 6;
icon_merge7 = 7;
icon_merge8 = 8;
icon_duplicate = 9;
icon_duplicate2 = 10;
icon_duplicate3 = 11;
icon_duplicate4 = 12;
icon_duplicate5 = 13;
icon_duplicate6 = 14;
icon_duplicate7 = 15;
icon_duplicate8 = 16;
i = 0;
if (file_exists("mods/palettes/multitroid/player_icons/sMultitroidIcon_0.png")){ icon_merge = sprite_add("mods/palettes/multitroid/player_icons/sMultitroidIcon_0.png", 1, false, false, 0, 0); i++;}
icon_duplicate = sprite_duplicate(icon_merge);
if (file_exists("mods/palettes/multitroid/player_icons/sMultitroidIcon_1.png")){ icon_merge2 = sprite_add("mods/palettes/multitroid/player_icons/sMultitroidIcon_1.png", 1, false, false, 0, 0); i++;}
@ -437,19 +437,3 @@ if(i == 8){
oControl.MultitroidMapIcon = icon_duplicate;
}
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);

9
scripts/sv6_load.gml
Unescape View File

@ -1,7 +1,8 @@
/// sv6_load()
scr_default_global_items();
global.acceptPacket = false;
oControl.alarm[3] = 180;
var header;
show_debug_message(room_get_name(global.lastroom));
show_debug_message(room_get_name(room));
@ -12,17 +13,17 @@ if(!instance_exists(oClient)){
} else if(instance_exists(oClient) && global.lastroom == gameoverroom){
//don't reset values
oClient.phase = 0;
oClient.queenHealth = 600;
oClient.queenHealth = global.mod_queenHstart + (global.mtanks * 10);
} else if(instance_exists(oClient) && global.lastroom != gameoverroom && string_count("rm_a", room_get_name(global.lastroom)) == 0){
load_character_vars();
reset_map();
init_map();
oClient.phase = 0;
oClient.queenHealth = 600;
oClient.queenHealth = global.mod_queenHstart + (global.mtanks * 10);
} else if(instance_exists(oClient) && global.lastroom != gameoverroom && string_count("rm_a", room_get_name(global.lastroom)) > 0){
//don't reset values
oClient.phase = 0;
oClient.queenHealth = 600;
oClient.queenHealth = global.mod_queenHstart + (global.mtanks * 10);
}
filename = argument0;

Write Preview
Loading…
Cancel
Save