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

Fixed some final bugs

Browse Source
cleaner
milesthenerd 5 years ago
parent 1f6e3416af
commit f93c6fa954
11 changed files with 166 additions and 51 deletions
Show Stats Download Patch File Download Diff File

17
objects/oClient.object.gmx
Unescape View File

@ -26,7 +26,7 @@
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string>network_set_config(network_config_connect_timeout, 5000); <string>network_set_config(network_config_connect_timeout, 5000);
strict_init(working_directory + "\Multitroid\dictionary.json"); strict_init(working_directory + "\multitroid\dictionary.json");
queenHealthResetQueued = false; queenHealthResetQueued = false;
canSend = false; canSend = false;
metroidCountChanged = false; metroidCountChanged = false;
@ -79,7 +79,7 @@ type = network_socket_tcp;
syncedDifficulty = global.difficulty; syncedDifficulty = global.difficulty;
elm = oControl.mod_monstersextremecheck; elm = oControl.mod_monstersextremecheck;
ini_open(working_directory + "\Multitroid\mod_settings.ini"); ini_open(working_directory + "\multitroid\mod_settings.ini");
ipaddress = ini_read_string("ModSettings", "ipaddress", "127.0.0.1"); ipaddress = ini_read_string("ModSettings", "ipaddress", "127.0.0.1");
name = ini_read_string("ModSettings", "displayname", "name"); name = ini_read_string("ModSettings", "displayname", "name");
port = ini_read_real("ModSettings", "port", 64198); port = ini_read_real("ModSettings", "port", 64198);
@ -91,7 +91,7 @@ ini_close();
var nameLength = string_length(name); var nameLength = string_length(name);
if(nameLength &gt; 15){ if(nameLength &gt; 15){
name = string_copy(name, 1, 15); name = string_copy(name, 1, 15);
ini_open(working_directory + "\Multitroid\mod_settings.ini"); ini_open(working_directory + "\multitroid\mod_settings.ini");
ini_write_string("ModSettings", "displayname", name); ini_write_string("ModSettings", "displayname", name);
ini_close(); ini_close();
} }
@ -1282,10 +1282,15 @@ if(keyboard_check_pressed(vk_f3)){
if(keyboard_check_pressed(vk_f4)){ if(keyboard_check_pressed(vk_f4)){
showName = -showName; showName = -showName;
if(showName){ switch(showName){
popup_text("Nametags enabled"); case 0:
} else { oControl.showname = "disabled";
popup_text("Nametags disabled"); popup_text("Nametags disabled");
break;
case 1:
oControl.showname = "enabled";
popup_text("Nametags enabled");
break;
} }
} }

83
objects/oControl.object.gmx
View File

File diff suppressed because one or more lines are too long

2
objects/oGameSelMenu.object.gmx
Unescape View File

@ -219,7 +219,7 @@ var ptanks = global.ptanks;
var detail; var detail;
j = 0; j = 0;
repeat (3) { repeat (3) {
filename = working_directory + "\Multitroid\save" + string(j + 1); filename = working_directory + "\multitroid\save" + string(j + 1);
if (file_exists(filename)) { if (file_exists(filename)) {
detail = sv6_load_details(filename); detail = sv6_load_details(filename);
if (detail == 1) { if (detail == 1) {

2
objects/oLoadGame.object.gmx
Unescape View File

@ -73,7 +73,7 @@
<kind>1</kind> <kind>1</kind>
<string>if (global.newgame == 1) { <string>if (global.newgame == 1) {
start_new_game(); start_new_game();
} else load_game(working_directory + "\Multitroid\save" + string(global.saveslot + 1)); } else load_game(working_directory + "\multitroid\save" + string(global.saveslot + 1));
</string> </string>
</argument> </argument>
</arguments> </arguments>

56
objects/oOptionsMod.object.gmx
Unescape View File

@ -38,6 +38,7 @@ num_port = tempnumcounter++;
num_name = tempnumcounter++; num_name = tempnumcounter++;
num_sequence = tempnumcounter++; num_sequence = tempnumcounter++;
num_color = tempnumcounter++; num_color = tempnumcounter++;
num_palette = tempnumcounter++;
num_showname = tempnumcounter++; num_showname = tempnumcounter++;
num_difficulty = tempnumcounter++; num_difficulty = tempnumcounter++;
num_elm = tempnumcounter++; num_elm = tempnumcounter++;
@ -109,6 +110,7 @@ tip[num_port] = "Set the port of the server";
tip[num_name] = "Set your display name"; tip[num_name] = "Set your display name";
tip[num_sequence] = "Toggle whether the reactor sequence is synced"; tip[num_sequence] = "Toggle whether the reactor sequence is synced";
tip[num_color] = "Pick your preferred player color"; tip[num_color] = "Pick your preferred player color";
tip[num_palette] = "Choose Default/Color/Custom Palette";
tip[num_showname] = "Enable/disable showing player names"; tip[num_showname] = "Enable/disable showing player names";
tip[num_difficulty] = "Choose the shared Multitroid difficulty"; tip[num_difficulty] = "Choose the shared Multitroid difficulty";
tip[num_elm] = "Choose the shared ELM difficulty"; tip[num_elm] = "Choose the shared ELM difficulty";
@ -248,6 +250,16 @@ if (active) {
sfx_play(sndMenuMove); sfx_play(sndMenuMove);
event_user(2); event_user(2);
} }
if (global.curropt == num_palette)
{
oControl.palette--;
if(oControl.palette &lt; 0){
oControl.palette = 2;
}
sfx_play(sndMenuMove);
event_user(2);
}
} }
if (global.curropt == num_difficulty &amp;&amp; instance_exists(oClient)) if (global.curropt == num_difficulty &amp;&amp; instance_exists(oClient))
@ -277,6 +289,16 @@ if (active) {
sfx_play(sndMenuMove); sfx_play(sndMenuMove);
event_user(2); event_user(2);
} }
if (global.curropt == num_palette)
{
oControl.palette++;
if(oControl.palette &gt; 2){
oControl.palette = 0;
}
sfx_play(sndMenuMove);
event_user(2);
}
} }
if (global.curropt == num_difficulty &amp;&amp; instance_exists(oClient)) if (global.curropt == num_difficulty &amp;&amp; instance_exists(oClient))
@ -313,14 +335,15 @@ if (active) {
event_user(2); event_user(2);
} }
var key; var key, keyBegin;
var keyBegin = (oControl.kMenu1 &gt; 0);
if(os_type != os_android){ if(os_type != os_android){
key = keyboard_check_pressed(vk_enter); key = keyboard_check_pressed(vk_enter);
} else { } else {
key = (oControl.kMenu1 &gt; 0); key = (oControl.kMenu1 &gt; 0);
} }
if (key &amp;&amp; oControl.kMenu1PushedSteps == 0) { if (key &amp;&amp; oControl.kMenu1PushedSteps == 0 || (os_type != os_android &amp;&amp; keyBegin &amp;&amp; oControl.kMenu1PushedSteps == 0 &amp;&amp; !editing)) {
if (global.curropt == num_ip &amp;&amp; os_type != os_android) { if (global.curropt == num_ip &amp;&amp; os_type != os_android) {
editing = !editing; editing = !editing;
op[num_ip].editing = editing; op[num_ip].editing = editing;
@ -541,7 +564,7 @@ if(ID == msg &amp;&amp; global.curropt == num_ip){
if(ds_map_find_value(async_load, "status")){ if(ds_map_find_value(async_load, "status")){
var input = ds_map_find_value(async_load, "result"); var input = ds_map_find_value(async_load, "result");
if(is_string(input)){ if(is_string(input)){
ini_open(working_directory + "\Multitroid\settings.ini"); ini_open(working_directory + "\multitroid\settings.ini");
ini_write_string("Settings", "ipaddress", input); ini_write_string("Settings", "ipaddress", input);
ini_close(); ini_close();
ip = input; ip = input;
@ -558,7 +581,7 @@ if(ID == msg &amp;&amp; global.curropt == num_port){
if(ds_map_find_value(async_load, "status")){ if(ds_map_find_value(async_load, "status")){
var input = ds_map_find_value(async_load, "value"); var input = ds_map_find_value(async_load, "value");
if(is_real(input)){ if(is_real(input)){
ini_open(working_directory + "\Multitroid\settings.ini"); ini_open(working_directory + "\multitroid\settings.ini");
ini_write_real("Settings", "port", input); ini_write_real("Settings", "port", input);
ini_close(); ini_close();
port = string(input); port = string(input);
@ -574,7 +597,7 @@ if(ID == msg &amp;&amp; global.curropt == num_name){
if(ds_map_find_value(async_load, "status")){ if(ds_map_find_value(async_load, "status")){
var input = ds_map_find_value(async_load, "result"); var input = ds_map_find_value(async_load, "result");
if(is_string(input)){ if(is_string(input)){
ini_open(working_directory + "\Multitroid\settings.ini"); ini_open(working_directory + "\multitroid\settings.ini");
ini_write_string("Settings", "name", input); ini_write_string("Settings", "name", input);
ini_close(); ini_close();
name = input; name = input;
@ -764,13 +787,26 @@ switch(showname){
break; break;
} }
ini_open(working_directory + "\Multitroid\mod_settings.ini"); switch(oControl.palette){
case 0:
op[num_palette].optext = "Default";
break;
case 1:
op[num_palette].optext = "Color";
break;
case 2:
op[num_palette].optext = "Custom";
break;
}
ini_open(working_directory + "\multitroid\mod_settings.ini");
ini_write_string("ModSettings", "ipaddress", ip); ini_write_string("ModSettings", "ipaddress", ip);
ini_write_real("ModSettings", "port", real(port)); ini_write_real("ModSettings", "port", real(port));
ini_write_string("ModSettings", "displayname", name); ini_write_string("ModSettings", "displayname", name);
ini_write_string("ModSettings", "reactorsequence", _sequence); ini_write_string("ModSettings", "reactorsequence", _sequence);
ini_write_string("ModSettings", "preferredcolor", color); ini_write_string("ModSettings", "preferredcolor", color);
ini_write_string("ModSettings", "showname", _showname); ini_write_string("ModSettings", "showname", _showname);
ini_write_real("ModSettings", "palette", oControl.palette);
ini_close(); ini_close();
oControl.ipaddress = ip; oControl.ipaddress = ip;
@ -859,6 +895,14 @@ if(!global.shaders_compiled){
canedit[num_color] = 0; canedit[num_color] = 0;
} }
op[num_palette] = instance_create(x, y + sep * tempcount++, oOptionLR);
op[num_palette].label = "Palette";
op[num_palette].optionid = num_palette;
if(!global.shaders_compiled){
op[num_palette].enabled = 0;
canedit[num_palette] = 0;
}
op[num_showname] = instance_create(x, y + sep * tempcount++, oOptionLR); op[num_showname] = instance_create(x, y + sep * tempcount++, oOptionLR);
op[num_showname].label = "Show names"; op[num_showname].label = "Show names";
op[num_showname].optionid = num_showname; op[num_showname].optionid = num_showname;

8
objects/oSS_Fg.object.gmx
Unescape View File

@ -115,7 +115,13 @@ widescreen_space = oControl.widescreen_space;
rectoffset -= 2; rectoffset -= 2;
} else fadein = 0; } else fadein = 0;
} }
if (active &amp;&amp; !fadein &amp;&amp; oControl.kStart &amp;&amp; oControl.kStartPushedSteps == 0) event_user(0); if (active &amp;&amp; !fadein &amp;&amp; oControl.kStart &amp;&amp; oControl.kStartPushedSteps == 0){
if(instance_exists(oOptionsMod)){
if(oOptionsMod.editing){
//do nothing
} else event_user(0);
} else event_user(0);
}
if (fadeout) rectoffset += 2; if (fadeout) rectoffset += 2;
if (ealpha &lt; 1 &amp;&amp; fadeout == 0) ealpha += 0.05; if (ealpha &lt; 1 &amp;&amp; fadeout == 0) ealpha += 0.05;
if (ealpha &gt; 0 &amp;&amp; fadeout) ealpha -= 0.05; if (ealpha &gt; 0 &amp;&amp; fadeout) ealpha -= 0.05;

4
scripts/characterStepEvent.gml
Unescape View File

@ -869,7 +869,7 @@ if (state == SAVINGFX) {
instance_create(x, y, oSaveFX); instance_create(x, y, oSaveFX);
instance_create(x, y, oSaveSparks); instance_create(x, y, oSaveSparks);
popup_text(get_text("Notifications", "GameSaved")); popup_text(get_text("Notifications", "GameSaved"));
save_game(working_directory + "\Multitroid\save" + string(global.saveslot + 1)); save_game(working_directory + "\multitroid\save" + string(global.saveslot + 1));
refill_heath_ammo(); refill_heath_ammo();
} }
if (statetime == 230) state = IDLE; if (statetime == 230) state = IDLE;
@ -934,7 +934,7 @@ if (state == SAVINGSHIP) {
if (state == SAVINGSHIPFX) { if (state == SAVINGSHIPFX) {
if (statetime == 1) { if (statetime == 1) {
sfx_play(sndSave); sfx_play(sndSave);
save_game(working_directory + "\Multitroid\save" + string(global.saveslot + 1)); save_game(working_directory + "\multitroid\save" + string(global.saveslot + 1));
refill_heath_ammo(); refill_heath_ammo();
popup_text(get_text("Notifications", "GameSaved")); popup_text(get_text("Notifications", "GameSaved"));
} }

16
scripts/copy_save.gml
Unescape View File

@ -1,22 +1,22 @@
/// copy_save(from, to) /// copy_save(from, to)
file1 = working_directory + "\Multitroid\save" + string(argument0 + 1); file1 = working_directory + "\multitroid\save" + string(argument0 + 1);
file2 = working_directory + "\Multitroid\save" + string(argument1 + 1); file2 = working_directory + "\multitroid\save" + string(argument1 + 1);
if (file_exists(file2)) file_delete(file2); if (file_exists(file2)) file_delete(file2);
file_copy(file1, file2); file_copy(file1, file2);
with (oGameSelMenu) event_user(2); with (oGameSelMenu) event_user(2);
saveslot_flash(argument1); saveslot_flash(argument1);
if (file_exists(working_directory + "\Multitroid\random" + string(argument1 + 1) + ".ini")) if (file_exists(working_directory + "\multitroid\random" + string(argument1 + 1) + ".ini"))
{ {
//This is only here for old file cleanup. //This is only here for old file cleanup.
file_delete(working_directory + "\Multitroid\random" + string(argument1 + 1) + ".ini"); file_delete(working_directory + "\multitroid\random" + string(argument1 + 1) + ".ini");
} }
if (file_exists(working_directory + "\Multitroid\save" + string(argument1 + 1) + ".dat")) if (file_exists(working_directory + "\multitroid\save" + string(argument1 + 1) + ".dat"))
{ {
file_delete(working_directory + "\Multitroid\save" + string(argument1 + 1) + ".dat"); file_delete(working_directory + "\multitroid\save" + string(argument1 + 1) + ".dat");
} }
if (file_exists(working_directory + "\Multitroid\save" + string(argument0 + 1) + ".dat")) if (file_exists(working_directory + "\multitroid\save" + string(argument0 + 1) + ".dat"))
{ {
file_copy(working_directory + "\Multitroid\save" + string(argument0 + 1) + ".dat", working_directory + "\Multitroid\save" + string(argument1 + 1) + ".dat"); file_copy(working_directory + "\multitroid\save" + string(argument0 + 1) + ".dat", working_directory + "\multitroid\save" + string(argument1 + 1) + ".dat");
} }

6
scripts/erase_save.gml
Unescape View File

@ -1,5 +1,5 @@
/// erase_save() /// erase_save()
filename = working_directory + "\Multitroid\save" + string(global.saveslot + 1); filename = working_directory + "\multitroid\save" + string(global.saveslot + 1);
file_delete(filename); file_delete(filename);
with (oMenuSaveSlot) if (slot == global.saveslot) { with (oMenuSaveSlot) if (slot == global.saveslot) {
saveexists = 0; saveexists = 0;
@ -7,5 +7,5 @@ with (oMenuSaveSlot) if (slot == global.saveslot) {
} }
saveslot_flash(global.saveslot); saveslot_flash(global.saveslot);
file_delete(working_directory + "\Multitroid\random" + string(global.saveslot + 1) + ".ini"); file_delete(working_directory + "\multitroid\random" + string(global.saveslot + 1) + ".ini");
file_delete(working_directory + "\Multitroid\save" + string(global.saveslot + 1) + ".dat"); file_delete(working_directory + "\multitroid\save" + string(global.saveslot + 1) + ".dat");

17
scripts/load_resources.gml
Unescape View File

@ -289,10 +289,10 @@ if (file_exists("mods/palettes/monsters/queen_dead.png")) oControl.QueenDead = b
if (file_exists("mods/palettes/monsters/queen_blood_drop.png")) oControl.QueenBloodDrop = sprite_add("mods/palettes/monsters/queen_blood_drop.png", sprite_get_number(sQueenBloodDrop), false, false, sprite_get_xoffset(sQueenBloodDrop), sprite_get_yoffset(sQueenBloodDrop)); if (file_exists("mods/palettes/monsters/queen_blood_drop.png")) oControl.QueenBloodDrop = sprite_add("mods/palettes/monsters/queen_blood_drop.png", sprite_get_number(sQueenBloodDrop), false, false, sprite_get_xoffset(sQueenBloodDrop), sprite_get_yoffset(sQueenBloodDrop));
if (file_exists("mods/palettes/monsters/queen_blood_particle.png")) oControl.QueenBloodParticle = sprite_add("mods/palettes/monsters/queen_blood_particle.png", sprite_get_number(sQueenBloodParticle), false, false, sprite_get_xoffset(sQueenBloodParticle), sprite_get_yoffset(sQueenBloodParticle)); if (file_exists("mods/palettes/monsters/queen_blood_particle.png")) oControl.QueenBloodParticle = sprite_add("mods/palettes/monsters/queen_blood_particle.png", sprite_get_number(sQueenBloodParticle), false, false, sprite_get_xoffset(sQueenBloodParticle), sprite_get_yoffset(sQueenBloodParticle));
if (file_exists("mods/palettes/multitroid/multitroid.png")) oControl.MultitroidPalette = sprite_add("mods/palettes/multitroid/multitroid.png", 1, false, false, 0, 0); if (file_exists("mods/palettes/multitroid/multitroid.png")) oControl.MultitroidPaletteCustom = sprite_add("mods/palettes/multitroid/multitroid.png", 1, false, false, 0, 0);
if (file_exists("mods/palettes/multitroid/multitroid_fusion.png")) oControl.MultitroidPaletteFusion = sprite_add("mods/palettes/multitroid/multitroid_fusion.png", 1, false, false, 0, 0); if (file_exists("mods/palettes/multitroid/multitroid_fusion.png")) oControl.MultitroidPaletteFusionCustom = sprite_add("mods/palettes/multitroid/multitroid_fusion.png", 1, false, false, 0, 0);
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/spiderball.png")) oControl.SpiderballPaletteCustom = 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); if (file_exists("mods/palettes/multitroid/baby_metroid.png")) oControl.MultitroidBabyPaletteCustom = sprite_add("mods/palettes/multitroid/baby_metroid.png", 1, false, false, 0, 0);
icon_sprite = 0; icon_sprite = 0;
icon_merge = 1; icon_merge = 1;
@ -376,7 +376,8 @@ if (file_exists("mods/palettes/multitroid/player_icons/sMultitroidPlayer_15.png"
icon_duplicate16 = sprite_duplicate(icon_merge16); icon_duplicate16 = sprite_duplicate(icon_merge16);
sprite_merge(icon_duplicate, icon_duplicate16); sprite_merge(icon_duplicate, icon_duplicate16);
if(i == 16){ if(i == 16){
oControl.MultitroidIcon = icon_duplicate; //oControl.MultitroidIcon = icon_duplicate;
oControl.MultitroidIconCustom = icon_duplicate;
show_debug_message("MultitroidIcons imported"); show_debug_message("MultitroidIcons imported");
} }
@ -462,7 +463,8 @@ if (file_exists("mods/palettes/multitroid/dark_player_icons/sDarkMultitroidPlaye
icon_duplicate16 = sprite_duplicate(icon_merge16); icon_duplicate16 = sprite_duplicate(icon_merge16);
sprite_merge(icon_duplicate, icon_duplicate16); sprite_merge(icon_duplicate, icon_duplicate16);
if(i == 16){ if(i == 16){
oControl.MultitroidIconDark = icon_duplicate; //oControl.MultitroidIconDark = icon_duplicate;
oControl.MultitroidIconDarkCustom = icon_duplicate;
show_debug_message("MultitroidIconDark imported"); show_debug_message("MultitroidIconDark imported");
} }
@ -548,6 +550,7 @@ if (file_exists("mods/palettes/multitroid/map_icons/sMultitroidMapIcon_15.png"))
icon_duplicate16 = sprite_duplicate(icon_merge16); icon_duplicate16 = sprite_duplicate(icon_merge16);
sprite_merge(icon_duplicate, icon_duplicate16); sprite_merge(icon_duplicate, icon_duplicate16);
if(i == 16){ if(i == 16){
oControl.MultitroidMapIcon = icon_duplicate; //oControl.MultitroidMapIcon = icon_duplicate;
oControl.MultitroidMapIconCustom = icon_duplicate;
show_debug_message("MultitroidMapIcons imported"); show_debug_message("MultitroidMapIcons imported");
} }

6
scripts/start_new_game.gml
Unescape View File

@ -7,9 +7,9 @@ global.timeofday = 0;
reset_map(); reset_map();
init_map(); init_map();
load_character_vars(); load_character_vars();
file_delete(working_directory + "\Multitroid\random" + string(global.saveslot + 1) + ".ini"); //This is only here for old file cleanup. file_delete(working_directory + "\multitroid\random" + string(global.saveslot + 1) + ".ini"); //This is only here for old file cleanup.
file_delete(working_directory + "\Multitroid\save" + string(global.saveslot + 1) + ".dat"); file_delete(working_directory + "\multitroid\save" + string(global.saveslot + 1) + ".dat");
scr_newgame(); scr_newgame();
save_game(working_directory + "\Multitroid\save" + string(global.saveslot + 1)); save_game(working_directory + "\multitroid\save" + string(global.saveslot + 1));
room_change(global.start_room, 0); room_change(global.start_room, 0);

Write Preview
Loading…
Cancel
Save