Fixed 1.3 test bugs

pull/28/head
milesthenerd 5 years ago
parent 98cbfa6141
commit 1f6e3416af

@ -25,7 +25,7 @@
<option_android_build_version>2</option_android_build_version>
<option_android_color_depth>1</option_android_color_depth>
<option_android_compile_sdk_version>28</option_android_compile_sdk_version>
<option_android_display_name>Multitroid 1.3 Testing</option_android_display_name>
<option_android_display_name>Multitroid 1.3 Testing 2</option_android_display_name>
<option_android_facebook_app_display_name></option_android_facebook_app_display_name>
<option_android_facebook_appid></option_android_facebook_appid>
<option_android_facebook_enable>0</option_android_facebook_enable>
@ -220,7 +220,7 @@
<option_changeresolution>false</option_changeresolution>
<option_closeesc>true</option_closeesc>
<option_colordepth>0</option_colordepth>
<option_display_name>AM2R Multitroid 1.3 Testing</option_display_name>
<option_display_name>AM2R Multitroid 1.3 Testing 2</option_display_name>
<option_displayerrors>True</option_displayerrors>
<option_ecma>0</option_ecma>
<option_facebook_app_display_name></option_facebook_app_display_name>
@ -362,7 +362,7 @@
<option_ios_texture_page>1024</option_ios_texture_page>
<option_ios_use_test_ads>false</option_ios_use_test_ads>
<option_lastchanged></option_lastchanged>
<option_linux_display_name>AM2R Multitroid 1.3 Testing</option_linux_display_name>
<option_linux_display_name>AM2R Multitroid 1.3 Testing 2</option_linux_display_name>
<option_linux_enable_steam>0</option_linux_enable_steam>
<option_linux_fullscreen>0</option_linux_fullscreen>
<option_linux_homepage>https://www.reddit.com/r/AM2R/</option_linux_homepage>

@ -26,7 +26,7 @@
<argument>
<kind>1</kind>
<string>network_set_config(network_config_connect_timeout, 5000);
strict_init(working_directory + "\dictionary.json");
strict_init(working_directory + "\Multitroid\dictionary.json");
queenHealthResetQueued = false;
canSend = false;
metroidCountChanged = false;
@ -69,7 +69,7 @@ pingTimer = 90;
resetTimer = -1;
teleport = false;
noName = false;
syncedDifficulty = 0;
syncedDifficulty = 1;
elm = 0;
state = undefined;
seed = undefined;
@ -79,7 +79,7 @@ type = network_socket_tcp;
syncedDifficulty = global.difficulty;
elm = oControl.mod_monstersextremecheck;
ini_open(working_directory + "\mod_settings.ini");
ini_open(working_directory + "\Multitroid\mod_settings.ini");
ipaddress = ini_read_string("ModSettings", "ipaddress", "127.0.0.1");
name = ini_read_string("ModSettings", "displayname", "name");
port = ini_read_real("ModSettings", "port", 64198);
@ -91,7 +91,7 @@ ini_close();
var nameLength = string_length(name);
if(nameLength &gt; 15){
name = string_copy(name, 1, 15);
ini_open(working_directory + "\mod_settings.ini");
ini_open(working_directory + "\Multitroid\mod_settings.ini");
ini_write_string("ModSettings", "displayname", name);
ini_close();
}
@ -2269,6 +2269,156 @@ switch(type_event){
global.itemPrev[i] = itemArr[f, 0];
if(global.item[i] != itemArr[f, 0]){
global.item[i] = itemArr[f, 0];
if(i == 0){
global.bomb = 1;
global.bombPrev = global.bomb;
popup_text(get_text("Items", "Bombs") + " " + get_text("GlobalOptions", "Enabled"));
}
if(i == 1){
global.powergrip = 1;
global.powergripPrev = global.powergrip;
popup_text(get_text("Items", "PowerGrip") + " " + get_text("GlobalOptions", "Enabled"));
}
if(i == 2){
global.spiderball = 1;
global.spiderballPrev = global.spiderball;
popup_text(get_text("Items", "SpiderBall") + " " + get_text("GlobalOptions", "Enabled"));
}
if(i == 3){
global.jumpball = 1;
global.jumpballPrev = global.jumpball;
popup_text(get_text("Items", "JumpBall") + " " + get_text("GlobalOptions", "Enabled"));
}
if(i == 4){
global.hijump = 1;
global.hijumpPrev = global.hijump;
popup_text(get_text("Items", "HiJump") + " " + get_text("GlobalOptions", "Enabled"));
}
if(i == 5){
global.currentsuit = 1;
global.currentsuitPrev = global.currentsuit;
popup_text(get_text("Items", "VariaSuit") + " " + get_text("GlobalOptions", "Enabled"));
if(sfx_isplaying(sndSpinJump)){
sfx_stop(sndSpinJump);
}
if(sfx_isplaying(sndSpaceJump)){
sfx_stop(sndSpaceJump);
}
if(sfx_isplaying(sndScrewAttack)){
sfx_stop(sndScrewAttack);
}
if(sfx_isplaying(sndSpaceScrewAttack)){
sfx_stop(sndSpaceScrewAttack);
}
}
if(i == 6){
global.spacejump = 1;
global.spacejumpPrev = global.spacejump;
popup_text(get_text("Items", "SpaceJump") + " " + get_text("GlobalOptions", "Enabled"));
if(sfx_isplaying(sndSpinJump)){
sfx_stop(sndSpinJump);
}
if(sfx_isplaying(sndSpaceJump)){
sfx_stop(sndSpaceJump);
}
if(sfx_isplaying(sndScrewAttack)){
sfx_stop(sndScrewAttack);
}
if(sfx_isplaying(sndSpaceScrewAttack)){
sfx_stop(sndSpaceScrewAttack);
}
}
if(i == 7){
global.speedbooster = 1;
global.speedboosterPrev = global.speedbooster;
popup_text(get_text("Items", "SpeedBooster") + " " + get_text("GlobalOptions", "Enabled"));
}
if(i == 8){
global.screwattack = 1;
global.screwattackPrev = global.screwattack;
popup_text(get_text("Items", "ScrewAttack") + " " + get_text("GlobalOptions", "Enabled"));
if(sfx_isplaying(sndSpinJump)){
sfx_stop(sndSpinJump);
}
if(sfx_isplaying(sndSpaceJump)){
sfx_stop(sndSpaceJump);
}
if(sfx_isplaying(sndScrewAttack)){
sfx_stop(sndScrewAttack);
}
if(sfx_isplaying(sndSpaceScrewAttack)){
sfx_stop(sndSpaceScrewAttack);
}
}
if(i == 9){
global.currentsuit = 2;
global.currentsuitPrev = global.currentsuit;
popup_text(get_text("Items", "GravitySuit") + " " + get_text("GlobalOptions", "Enabled"));
if(sfx_isplaying(sndSpinJump)){
sfx_stop(sndSpinJump);
}
if(sfx_isplaying(sndSpaceJump)){
sfx_stop(sndSpaceJump);
}
if(sfx_isplaying(sndScrewAttack)){
sfx_stop(sndScrewAttack);
}
if(sfx_isplaying(sndSpaceScrewAttack)){
sfx_stop(sndSpaceScrewAttack);
}
}
if(i == 10){
global.cbeam = 1;
global.cbeamPrev = global.cbeam;
popup_text(get_text("Items", "ChargeBeam") + " " + get_text("GlobalOptions", "Enabled"));
}
if(i == 11){
global.ibeam = 1;
global.ibeamPrev = global.ibeam;
popup_text(get_text("Items", "IceBeam") + " " + get_text("GlobalOptions", "Enabled"));
}
if(i == 12){
global.wbeam = 1;
global.wbeamPrev = global.wbeam;
popup_text(get_text("Items", "WaveBeam") + " " + get_text("GlobalOptions", "Enabled"));
}
if(i == 13){
global.sbeam = 1;
global.sbeamPrev = global.sbeam;
popup_text(get_text("Items", "SpazerBeam") + " " + get_text("GlobalOptions", "Enabled"));
}
if(i == 14){
global.pbeam = 1;
global.pbeamPrev = global.pbeam;
popup_text(get_text("Items", "PlasmaBeam") + " " + get_text("GlobalOptions", "Enabled"));
}
}
}
}
@ -3681,17 +3831,19 @@ if(!noName){
draw_character_ext(arrSprite, arrX, arrY, arrA1, arrA1X, arrA1Y, arrA2, arrA2X, arrA2Y, arrA2A, arrMirror, arrBlend, alpha, arrArmmsl, arrImage, arrID);
var sprHeight = sprite_get_height(sIdleRight);
if(arrSprite != sTurn &amp;&amp; arrSprite != sVTurn &amp;&amp; arrSprite != sGTurn &amp;&amp; arrSprite != sTurn_fusion &amp;&amp; arrSprite != sTurn_fusion_varia &amp;&amp; arrSprite != sTurn_fusion_gravity) sprHeight = sprite_get_height(arrSprite);
if(string_count("AimUp", sprite_get_name(arrSprite)) &gt; 0) sprHeight = sprite_get_height(sIdleRight);
if(string_lower(arrName) == "meep" &amp;&amp; string_count("Crouch", sprite_get_name(arrSprite))) sprHeight += 10;
if(string_lower(arrName) == "omegadruid" &amp;&amp; arrState != oCharacter.BALL &amp;&amp; arrState != oCharacter.CLIMBING &amp;&amp; string_count("JumpLeft", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("JumpRight", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("Ball", sprite_get_name(arrSprite)) == 0) draw_sprite_ext(sMOmega_Head_Roar, 2, arrX, arrY - sprHeight, 0.5 * arrMirror, 0.5, direction, c_white, 1);
if(string_lower(arrName) == "meep" &amp;&amp; arrState != oCharacter.BALL &amp;&amp; arrState != oCharacter.CLIMBING &amp;&amp; string_count("JumpLeft", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("JumpRight", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("Ball", sprite_get_name(arrSprite)) == 0) draw_sprite_ext(sMiepee, 2, arrX, arrY - sprHeight, 1 * arrMirror, 1, direction, c_white, 1);
if(string_lower(arrName) == "omegadruid" &amp;&amp; string_count("JumpLeft", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("JumpRight", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("Ball", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("Walljump", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("Spacejump", sprite_get_name(arrSprite)) == 0) draw_sprite_ext(sMOmega_Head_Roar, 2, arrX, arrY - sprHeight, 0.5 * arrMirror, 0.5, direction, c_white, 1);
if(string_lower(arrName) == "meep" &amp;&amp; string_count("JumpLeft", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("JumpRight", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("Ball", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("Walljump", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("Spacejump", sprite_get_name(arrSprite)) == 0) draw_sprite_ext(sMiepee, 2, arrX, arrY - sprHeight, 1 * arrMirror, 1, direction, c_white, 1);
}
} else {
draw_character_ext(arrSprite, arrX, arrY, arrA1, arrA1X, arrA1Y, arrA2, arrA2X, arrA2Y, arrA2A, arrMirror, arrBlend, alpha, arrArmmsl, arrImage, arrID);
var sprHeight = sprite_get_height(sIdleRight);
if(arrSprite != sTurn &amp;&amp; arrSprite != sVTurn &amp;&amp; arrSprite != sGTurn &amp;&amp; arrSprite != sTurn_fusion &amp;&amp; arrSprite != sTurn_fusion_varia &amp;&amp; arrSprite != sTurn_fusion_gravity) sprHeight = sprite_get_height(arrSprite);
if(string_count("AimUp", sprite_get_name(arrSprite)) &gt; 0) sprHeight = sprite_get_height(sIdleRight);
if(string_lower(arrName) == "meep" &amp;&amp; string_count("Crouch", sprite_get_name(arrSprite))) sprHeight += 10;
if(string_lower(arrName) == "omegadruid" &amp;&amp; arrState != oCharacter.BALL &amp;&amp; arrState != oCharacter.CLIMBING &amp;&amp; string_count("JumpLeft", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("JumpRight", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("Ball", sprite_get_name(arrSprite)) == 0) draw_sprite_ext(sMOmega_Head_Roar, 2, arrX, arrY - sprHeight, 0.5 * arrMirror, 0.5, direction, c_white, 1);
if(string_lower(arrName) == "meep" &amp;&amp; arrState != oCharacter.BALL &amp;&amp; arrState != oCharacter.CLIMBING &amp;&amp; string_count("JumpLeft", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("JumpRight", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("Ball", sprite_get_name(arrSprite)) == 0) draw_sprite_ext(sMiepee, 2, arrX, arrY - sprHeight, 1 * arrMirror, 1, direction, c_white, 1);
if(string_lower(arrName) == "omegadruid" &amp;&amp; string_count("JumpLeft", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("JumpRight", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("Ball", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("Walljump", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("Spacejump", sprite_get_name(arrSprite)) == 0) draw_sprite_ext(sMOmega_Head_Roar, 2, arrX, arrY - sprHeight, 0.5 * arrMirror, 0.5, direction, c_white, 1);
if(string_lower(arrName) == "meep" &amp;&amp; string_count("JumpLeft", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("JumpRight", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("Ball", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("Walljump", sprite_get_name(arrSprite)) == 0 &amp;&amp; string_count("Spacejump", sprite_get_name(arrSprite)) == 0) draw_sprite_ext(sMiepee, 2, arrX, arrY - sprHeight, 1 * arrMirror, 1, direction, c_white, 1);
}
}
}

File diff suppressed because one or more lines are too long

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

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

@ -446,6 +446,7 @@ if(instance_exists(oClient) &amp;&amp; instance_exists(self) &amp;&amp; instance
}
if(!done){
/*
if(!instance_exists(oClient)){
op[num_difficulty].enabled = 0;
canedit[num_difficulty] = 0;
@ -458,6 +459,7 @@ if(!done){
canedit[num_difficulty] = 0;
}
}
*/
if(!instance_exists(oClient)){
op[num_seedgen].enabled = 0;
@ -472,6 +474,7 @@ if(!done){
}
}
/*
if(!instance_exists(oClient)){
op[num_elm].enabled = 0;
canedit[num_elm] = 0;
@ -484,6 +487,7 @@ if(!done){
canedit[num_elm] = 0;
}
}
*/
switch(menuDifficulty){
case 0:
@ -537,7 +541,7 @@ if(ID == msg &amp;&amp; global.curropt == num_ip){
if(ds_map_find_value(async_load, "status")){
var input = ds_map_find_value(async_load, "result");
if(is_string(input)){
ini_open(working_directory + "\settings.ini");
ini_open(working_directory + "\Multitroid\settings.ini");
ini_write_string("Settings", "ipaddress", input);
ini_close();
ip = input;
@ -554,7 +558,7 @@ if(ID == msg &amp;&amp; global.curropt == num_port){
if(ds_map_find_value(async_load, "status")){
var input = ds_map_find_value(async_load, "value");
if(is_real(input)){
ini_open(working_directory + "\settings.ini");
ini_open(working_directory + "\Multitroid\settings.ini");
ini_write_real("Settings", "port", input);
ini_close();
port = string(input);
@ -570,7 +574,7 @@ if(ID == msg &amp;&amp; global.curropt == num_name){
if(ds_map_find_value(async_load, "status")){
var input = ds_map_find_value(async_load, "result");
if(is_string(input)){
ini_open(working_directory + "\settings.ini");
ini_open(working_directory + "\Multitroid\settings.ini");
ini_write_string("Settings", "name", input);
ini_close();
name = input;
@ -760,7 +764,7 @@ switch(showname){
break;
}
ini_open(working_directory + "\mod_settings.ini");
ini_open(working_directory + "\Multitroid\mod_settings.ini");
ini_write_string("ModSettings", "ipaddress", ip);
ini_write_real("ModSettings", "port", real(port));
ini_write_string("ModSettings", "displayname", name);
@ -863,10 +867,16 @@ op[num_difficulty] = instance_create(x, y + sep * tempcount++, oOptionLR);
op[num_difficulty].label = "Difficulty";
op[num_difficulty].optionid = num_difficulty;
op[num_difficulty].enabled = 0;
canedit[num_difficulty] = 0;
op[num_elm] = instance_create(x, y + sep * tempcount++, oOptionLR);
op[num_elm].label = "Extreme Lab Metroids";
op[num_elm].optionid = num_elm;
op[num_elm].enabled = 0;
canedit[num_elm] = 0;
op[num_seedgen] = instance_create(x, y + sep * tempcount++, oPauseOption);
op[num_seedgen].optionid = num_seedgen;
op[num_seedgen].label = "Generate seed";

@ -129,9 +129,9 @@ alarm[0] = 60 + random(200);
enemy_active_check(70);
enemy_target_check(firerange, 1);
if (frozen == 0){
myobj.frozen = 0;
if(instance_exists(myobj)) myobj.frozen = 0;
} else {
myobj.frozen = 1;
if(instance_exists(myobj)) myobj.frozen = 1;
}
if (active == 1 &amp;&amp; stun == 0 &amp;&amp; frozen == 0 &amp;&amp; state != 100) {
if (state == 0) {

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

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

@ -27,15 +27,17 @@ if (argument13 == 1) {
}
if(instance_exists(oClient) && instance_exists(oCharacter)){
if(oClient.connected && string_lower(oClient.name) == "omegadruid" && oCharacter.state != oCharacter.BALL && oCharacter.state != oCharacter.CLIMBING && oCharacter.vjump != 0 && !(oCharacter.sjball > 0) && oCharacter.state != oCharacter.AIRBALL){
if(oClient.connected && string_lower(oClient.name) == "omegadruid" && string_count("JumpLeft", sprite_get_name(sprite_index)) == 0 && string_count("JumpRight", sprite_get_name(sprite_index)) == 0 && string_count("Ball", sprite_get_name(sprite_index)) == 0 && string_count("Walljump", sprite_get_name(sprite_index)) == 0 && string_count("Spacejump", sprite_get_name(sprite_index)) == 0){
var sprHeight = sprite_get_height(sIdleRight);
if(sprite_index != sTurn && sprite_index != sVTurn && sprite_index != sGTurn && sprite_index != sTurn_fusion && sprite_index != sTurn_fusion_varia && sprite_index != sTurn_fusion_gravity) sprHeight = sprite_height;
if(string_count("AimUp", sprite_get_name(sprite_index)) > 0) sprHeight = sprite_get_height(sIdleRight);
draw_sprite_ext(sMOmega_Head_Roar, 2, argument1, argument2 - sprHeight, 0.5 * argument10, 0.5, direction, c_white, 1);
}
if(oClient.connected && string_lower(oClient.name) == "meep" && oCharacter.state != oCharacter.BALL && oCharacter.state != oCharacter.CLIMBING && oCharacter.vjump != 0 && !(oCharacter.sjball > 0) && oCharacter.state != oCharacter.AIRBALL){
if(oClient.connected && string_lower(oClient.name) == "meep" && string_count("JumpLeft", sprite_get_name(sprite_index)) == 0 && string_count("JumpRight", sprite_get_name(sprite_index)) == 0 && string_count("Ball", sprite_get_name(sprite_index)) == 0 && string_count("Walljump", sprite_get_name(sprite_index)) == 0 && string_count("Spacejump", sprite_get_name(sprite_index)) == 0){
var sprHeight = sprite_get_height(sIdleRight);
if(sprite_index != sTurn && sprite_index != sVTurn && sprite_index != sGTurn && sprite_index != sTurn_fusion && sprite_index != sTurn_fusion_varia && sprite_index != sTurn_fusion_gravity) sprHeight = sprite_height;
if(string_count("AimUp", sprite_get_name(sprite_index)) > 0) sprHeight = sprite_get_height(sIdleRight);
if(string_count("Crouch", sprite_get_name(sprite_index))) sprHeight += 10;
draw_sprite_ext(sMiepee, 2, argument1, argument2 - sprHeight, 1 * argument10, 1, direction, c_white, 1);
}

@ -252,6 +252,26 @@ draw_sprite(sGUIPBomb, 1, xoff + 1, 4);
}
}
if(instance_exists(oClient)){
if(oClient.connected){
if(ds_list_size(global.idList) > 1 && ds_list_size(global.idList) <= 6){
for(var f=0; f<ds_list_size(global.idList); f++){
var arrList = global.idList[| f];
var ID = arrList[0, 0];
var _x = 10 * floor(f / 2),
var _y = 10 * (f % 2);
if(ID == global.clientID){
draw_sprite(oControl.MultitroidIcon, (ID - 1), (240 - _x) + widescreen_space, 5 + _y);
} else {
draw_sprite(oControl.MultitroidIconDark, (ID - 1), (240 - _x) + widescreen_space, 5 + _y);
}
}
} else if(ds_list_size(global.idList) == 1 || ds_list_size(global.idList) == 0){
draw_sprite(oControl.MultitroidIcon, clamp(global.clientID - 1, 0, 8), 240 + widescreen_space, 5);
}
}
}
if (global.ophudshowmap && global.ophudshowmetrcount) {
draw_background(bgGUIMap, 250 + widescreen_space, 0);
xoff = 250;

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

@ -2,20 +2,20 @@
i = 50;
repeat (50) {
i -= 1;
global.unlock[i] = 0;
global.unlock[i] = 1;
}
i = 50;
repeat (50) {
i -= 1;
global.gallery[i] = 0;
global.gallery[i] = 1;
}
i = 100;
repeat (100) {
i -= 1;
global.stat[i] = 0;
global.stat[i] = 1;
}
i = 100;
repeat (100) {
i -= 1;
global.achievement[i] = 0;
global.achievement[i] = 1;
}

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

@ -1,6 +1,6 @@
/// unlock_gallery(index)
if (global.gallery[argument0] == 0) {
global.gallery[argument0] = 1;
save_stats();
if (!file_exists("extras.sav")) { save_stats2(); load_stats2(); } //without this you can't play random games without restart
//save_stats();
//if (!file_exists("extras.sav")) { save_stats2(); load_stats2(); } //without this you can't play random games without restart
}

@ -1,6 +1,6 @@
/// unlock_set(index)
if (global.unlock[argument0] == 0) {
global.unlock[argument0] = 1;
save_stats();
if (!file_exists("extras.sav")) { save_stats2(); load_stats2(); } //without this you can't play random games without restart
//save_stats();
//if (!file_exists("extras.sav")) { save_stats2(); load_stats2(); } //without this you can't play random games without restart
}

Loading…
Cancel
Save