From a25e0ac505c78dd64f58847c47c058d2a04ddede Mon Sep 17 00:00:00 2001 From: milesthenerd Date: Thu, 29 Jul 2021 01:08:00 -0500 Subject: [PATCH 01/20] Fixed #1 --- scripts/mus_stop_muted.gml | 94 +++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/scripts/mus_stop_muted.gml b/scripts/mus_stop_muted.gml index 1cfc4ec..6c43a2a 100644 --- a/scripts/mus_stop_muted.gml +++ b/scripts/mus_stop_muted.gml @@ -1,50 +1,50 @@ /// mus_stop_muted() -if (audio_is_playing(musTitle) && audio_sound_get_gain(musTitle) == 0) audio_stop_sound(musTitle); -if (audio_is_playing(musFanfare) && audio_sound_get_gain(musFanfare) == 0) audio_stop_sound(musFanfare); -if (audio_is_playing(musMainCave) && audio_sound_get_gain(musMainCave) == 0) audio_stop_sound(musMainCave); -if (audio_is_playing(musMonsterAppear) && audio_sound_get_gain(musMonsterAppear) == 0) audio_stop_sound(musMonsterAppear); -if (audio_is_playing(musAlphaFight) && audio_sound_get_gain(musAlphaFight) == 0) audio_stop_sound(musAlphaFight); -if (audio_is_playing(musCaveAmbience) && audio_sound_get_gain(musCaveAmbience) == 0) audio_stop_sound(musCaveAmbience); -if (audio_is_playing(musArea1A) && audio_sound_get_gain(musArea1A) == 0) audio_stop_sound(musArea1A); -if (audio_is_playing(musArea1B) && audio_sound_get_gain(musArea1B) == 0) audio_stop_sound(musArea1B); -if (audio_is_playing(musTester) && audio_sound_get_gain(musTester) == 0) audio_stop_sound(musTester); -if (audio_is_playing(musAncientGuardian) && audio_sound_get_gain(musAncientGuardian) == 0) audio_stop_sound(musAncientGuardian); -if (audio_is_playing(musItemGet) && audio_sound_get_gain(musItemGet) == 0) audio_stop_sound(musItemGet); -if (audio_is_playing(musArea2A) && audio_sound_get_gain(musArea2A) == 0) audio_stop_sound(musArea2A); -if (audio_is_playing(musArea2B) && audio_sound_get_gain(musArea2B) == 0) audio_stop_sound(musArea2B); -if (audio_is_playing(musArachnus) && audio_sound_get_gain(musArachnus) == 0) audio_stop_sound(musArachnus); -if (audio_is_playing(musArea3A) && audio_sound_get_gain(musArea3A) == 0) audio_stop_sound(musArea3A); -if (audio_is_playing(musArea3B) && audio_sound_get_gain(musArea3B) == 0) audio_stop_sound(musArea3B); -if (audio_is_playing(musTorizoA) && audio_sound_get_gain(musTorizoA) == 0) audio_stop_sound(musTorizoA); -if (audio_is_playing(musTorizoB) && audio_sound_get_gain(musTorizoB) == 0) audio_stop_sound(musTorizoB); -if (audio_is_playing(musGammaFight) && audio_sound_get_gain(musGammaFight) == 0) audio_stop_sound(musGammaFight); -if (audio_is_playing(musMainCave2) && audio_sound_get_gain(musMainCave2) == 0) audio_stop_sound(musMainCave2); -if (audio_is_playing(musLabAmbience) && audio_sound_get_gain(musLabAmbience) == 0) audio_stop_sound(musLabAmbience); -if (audio_is_playing(musCaveAmbienceA4) && audio_sound_get_gain(musCaveAmbienceA4) == 0) audio_stop_sound(musCaveAmbienceA4); -if (audio_is_playing(musArea4A) && audio_sound_get_gain(musArea4A) == 0) audio_stop_sound(musArea4A); -if (audio_is_playing(musArea4B) && audio_sound_get_gain(musArea4B) == 0) audio_stop_sound(musArea4B); -if (audio_is_playing(musReactor) && audio_sound_get_gain(musReactor) == 0) audio_stop_sound(musReactor); -if (audio_is_playing(musZetaFight) && audio_sound_get_gain(musZetaFight) == 0) audio_stop_sound(musZetaFight); -if (audio_is_playing(musArea5A) && audio_sound_get_gain(musArea5A) == 0) audio_stop_sound(musArea5A); -if (audio_is_playing(musArea5B) && audio_sound_get_gain(musArea5B) == 0) audio_stop_sound(musArea5B); -if (audio_is_playing(musEris) && audio_sound_get_gain(musEris) == 0) audio_stop_sound(musEris); -if (audio_is_playing(musItemAmb) && audio_sound_get_gain(musItemAmb) == 0) audio_stop_sound(musItemAmb); +if (audio_is_playing(musTitle) && approximatelyZero(audio_sound_get_gain(musTitle))) audio_stop_sound(musTitle); +if (audio_is_playing(musFanfare) && approximatelyZero(audio_sound_get_gain(musFanfare))) audio_stop_sound(musFanfare); +if (audio_is_playing(musMainCave) && approximatelyZero(audio_sound_get_gain(musMainCave))) audio_stop_sound(musMainCave); +if (audio_is_playing(musMonsterAppear) && approximatelyZero(audio_sound_get_gain(musMonsterAppear))) audio_stop_sound(musMonsterAppear); +if (audio_is_playing(musAlphaFight) && approximatelyZero(audio_sound_get_gain(musAlphaFight))) audio_stop_sound(musAlphaFight); +if (audio_is_playing(musCaveAmbience) && approximatelyZero(audio_sound_get_gain(musCaveAmbience))) audio_stop_sound(musCaveAmbience); +if (audio_is_playing(musArea1A) && approximatelyZero(audio_sound_get_gain(musArea1A))) audio_stop_sound(musArea1A); +if (audio_is_playing(musArea1B) && approximatelyZero(audio_sound_get_gain(musArea1B))) audio_stop_sound(musArea1B); +if (audio_is_playing(musTester) && approximatelyZero(audio_sound_get_gain(musTester))) audio_stop_sound(musTester); +if (audio_is_playing(musAncientGuardian) && approximatelyZero(audio_sound_get_gain(musAncientGuardian))) audio_stop_sound(musAncientGuardian); +if (audio_is_playing(musItemGet) && approximatelyZero(audio_sound_get_gain(musItemGet))) audio_stop_sound(musItemGet); +if (audio_is_playing(musArea2A) && approximatelyZero(audio_sound_get_gain(musArea2A))) audio_stop_sound(musArea2A); +if (audio_is_playing(musArea2B) && approximatelyZero(audio_sound_get_gain(musArea2B))) audio_stop_sound(musArea2B); +if (audio_is_playing(musArachnus) && approximatelyZero(audio_sound_get_gain(musArachnus))) audio_stop_sound(musArachnus); +if (audio_is_playing(musArea3A) && approximatelyZero(audio_sound_get_gain(musArea3A))) audio_stop_sound(musArea3A); +if (audio_is_playing(musArea3B) && approximatelyZero(audio_sound_get_gain(musArea3B))) audio_stop_sound(musArea3B); +if (audio_is_playing(musTorizoA) && approximatelyZero(audio_sound_get_gain(musTorizoA))) audio_stop_sound(musTorizoA); +if (audio_is_playing(musTorizoB) && approximatelyZero(audio_sound_get_gain(musTorizoB))) audio_stop_sound(musTorizoB); +if (audio_is_playing(musGammaFight) && approximatelyZero(audio_sound_get_gain(musGammaFight))) audio_stop_sound(musGammaFight); +if (audio_is_playing(musMainCave2) && approximatelyZero(audio_sound_get_gain(musMainCave2))) audio_stop_sound(musMainCave2); +if (audio_is_playing(musLabAmbience) && approximatelyZero(audio_sound_get_gain(musLabAmbience))) audio_stop_sound(musLabAmbience); +if (audio_is_playing(musCaveAmbienceA4) && approximatelyZero(audio_sound_get_gain(musCaveAmbienceA4))) audio_stop_sound(musCaveAmbienceA4); +if (audio_is_playing(musArea4A) && approximatelyZero(audio_sound_get_gain(musArea4A))) audio_stop_sound(musArea4A); +if (audio_is_playing(musArea4B) && approximatelyZero(audio_sound_get_gain(musArea4B))) audio_stop_sound(musArea4B); +if (audio_is_playing(musReactor) && approximatelyZero(audio_sound_get_gain(musReactor))) audio_stop_sound(musReactor); +if (audio_is_playing(musZetaFight) && approximatelyZero(audio_sound_get_gain(musZetaFight))) audio_stop_sound(musZetaFight); +if (audio_is_playing(musArea5A) && approximatelyZero(audio_sound_get_gain(musArea5A))) audio_stop_sound(musArea5A); +if (audio_is_playing(musArea5B) && approximatelyZero(audio_sound_get_gain(musArea5B))) audio_stop_sound(musArea5B); +if (audio_is_playing(musEris) && approximatelyZero(audio_sound_get_gain(musEris))) audio_stop_sound(musEris); +if (audio_is_playing(musItemAmb) && approximatelyZero(audio_sound_get_gain(musItemAmb))) audio_stop_sound(musItemAmb); if (file_exists("musItemAmb2.ogg")) { - if (audio_is_playing(musItemAmb2) && audio_sound_get_gain(musItemAmb2) == 0) audio_stop_sound(musItemAmb2); + if (audio_is_playing(musItemAmb2) && approximatelyZero(audio_sound_get_gain(musItemAmb2))) audio_stop_sound(musItemAmb2); } -if (audio_is_playing(musOmegaFight) && audio_sound_get_gain(musOmegaFight) == 0) audio_stop_sound(musOmegaFight); -if (audio_is_playing(musArea6A) && audio_sound_get_gain(musArea6A) == 0) audio_stop_sound(musArea6A); -if (audio_is_playing(musArea7A) && audio_sound_get_gain(musArea7A) == 0) audio_stop_sound(musArea7A); -if (audio_is_playing(musArea7B) && audio_sound_get_gain(musArea7B) == 0) audio_stop_sound(musArea7B); -if (audio_is_playing(musArea7C) && audio_sound_get_gain(musArea7C) == 0) audio_stop_sound(musArea7C); -if (audio_is_playing(musArea7D) && audio_sound_get_gain(musArea7D) == 0) audio_stop_sound(musArea7D); -if (audio_is_playing(musHatchling) && audio_sound_get_gain(musHatchling) == 0) audio_stop_sound(musHatchling); -if (audio_is_playing(musQueenIntro) && audio_sound_get_gain(musQueenIntro) == 0) audio_stop_sound(musQueenIntro); -if (audio_is_playing(musQueen) && audio_sound_get_gain(musQueen) == 0) audio_stop_sound(musQueen); -if (audio_is_playing(musQueen2) && audio_sound_get_gain(musQueen2) == 0) audio_stop_sound(musQueen2); -if (audio_is_playing(musQueen3) && audio_sound_get_gain(musQueen3) == 0) audio_stop_sound(musQueen3); -if (audio_is_playing(musQueenBreak) && audio_sound_get_gain(musQueenBreak) == 0) audio_stop_sound(musQueenBreak); -if (audio_is_playing(musCredits) && audio_sound_get_gain(musCredits) == 0) audio_stop_sound(musCredits); -if (audio_is_playing(musIntroSeq) && audio_sound_get_gain(musIntroSeq) == 0) audio_stop_sound(musIntroSeq); -if (audio_is_playing(musArea8) && audio_sound_get_gain(musArea8) == 0) audio_stop_sound(musArea8); -if (audio_is_playing(musGenesis) && audio_sound_get_gain(musGenesis) == 0) audio_stop_sound(musGenesis); +if (audio_is_playing(musOmegaFight) && approximatelyZero(audio_sound_get_gain(musOmegaFight))) audio_stop_sound(musOmegaFight); +if (audio_is_playing(musArea6A) && approximatelyZero(audio_sound_get_gain(musArea6A))) audio_stop_sound(musArea6A); +if (audio_is_playing(musArea7A) && approximatelyZero(audio_sound_get_gain(musArea7A))) audio_stop_sound(musArea7A); +if (audio_is_playing(musArea7B) && approximatelyZero(audio_sound_get_gain(musArea7B))) audio_stop_sound(musArea7B); +if (audio_is_playing(musArea7C) && approximatelyZero(audio_sound_get_gain(musArea7C))) audio_stop_sound(musArea7C); +if (audio_is_playing(musArea7D) && approximatelyZero(audio_sound_get_gain(musArea7D))) audio_stop_sound(musArea7D); +if (audio_is_playing(musHatchling) && approximatelyZero(audio_sound_get_gain(musHatchling))) audio_stop_sound(musHatchling); +if (audio_is_playing(musQueenIntro) && approximatelyZero(audio_sound_get_gain(musQueenIntro))) audio_stop_sound(musQueenIntro); +if (audio_is_playing(musQueen) && approximatelyZero(audio_sound_get_gain(musQueen))) audio_stop_sound(musQueen); +if (audio_is_playing(musQueen2) && approximatelyZero(audio_sound_get_gain(musQueen2))) audio_stop_sound(musQueen2); +if (audio_is_playing(musQueen3) && approximatelyZero(audio_sound_get_gain(musQueen3))) audio_stop_sound(musQueen3); +if (audio_is_playing(musQueenBreak) && approximatelyZero(audio_sound_get_gain(musQueenBreak))) audio_stop_sound(musQueenBreak); +if (audio_is_playing(musCredits) && approximatelyZero(audio_sound_get_gain(musCredits))) audio_stop_sound(musCredits); +if (audio_is_playing(musIntroSeq) && approximatelyZero(audio_sound_get_gain(musIntroSeq))) audio_stop_sound(musIntroSeq); +if (audio_is_playing(musArea8) && approximatelyZero(audio_sound_get_gain(musArea8))) audio_stop_sound(musArea8); +if (audio_is_playing(musGenesis) && approximatelyZero(audio_sound_get_gain(musGenesis))) audio_stop_sound(musGenesis); From a072e34c4ee31bfcb9ca6195d6bf3d8b4b5a73b6 Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Sun, 1 Aug 2021 00:16:12 -0500 Subject: [PATCH 02/20] Fixes #77 --- AM2R.project.gmx | 206 ++++++++++++++++++++++++----------------------- 1 file changed, 104 insertions(+), 102 deletions(-) diff --git a/AM2R.project.gmx b/AM2R.project.gmx index df35a63..4841cba 100644 --- a/AM2R.project.gmx +++ b/AM2R.project.gmx @@ -542,108 +542,6 @@ - - fusion_gravity.png - -1 - 305 - 2 - - 0 - -1 - 0 - 0 - - - 9223372036854775807 - - - fusion_gravity.png - - - fusion_power.png - -1 - 302 - 2 - - 0 - -1 - 0 - 0 - - - 9223372036854775807 - - - fusion_power.png - - - fusion_varia.png - -1 - 300 - 2 - - 0 - -1 - 0 - 0 - - - 9223372036854775807 - - - fusion_varia.png - - - gravity.png - -1 - 370 - 2 - - 0 - -1 - 0 - 0 - - - 9223372036854775807 - - - gravity.png - - - power.png - -1 - 286 - 2 - - 0 - -1 - 0 - 0 - - - 9223372036854775807 - - - power.png - - - varia.png - -1 - 257 - 2 - - 0 - -1 - 0 - 0 - - - 9223372036854775807 - - - varia.png - fusion_gravity.png @@ -956,6 +854,110 @@ varia.png + + + fusion_gravity.png + -1 + 305 + 2 + + 0 + -1 + 0 + 0 + + + 9223372036854775807 + + + fusion_gravity.png + + + fusion_power.png + -1 + 302 + 2 + + 0 + -1 + 0 + 0 + + + 9223372036854775807 + + + fusion_power.png + + + fusion_varia.png + -1 + 300 + 2 + + 0 + -1 + 0 + 0 + + + 9223372036854775807 + + + fusion_varia.png + + + gravity.png + -1 + 370 + 2 + + 0 + -1 + 0 + 0 + + + 9223372036854775807 + + + gravity.png + + + power.png + -1 + 286 + 2 + + 0 + -1 + 0 + 0 + + + 9223372036854775807 + + + power.png + + + varia.png + -1 + 257 + 2 + + 0 + -1 + 0 + 0 + + + 9223372036854775807 + + + varia.png + + From c9ba041e9dcb92fc3f8f1a8c88e907ea59c527ea Mon Sep 17 00:00:00 2001 From: Miepee <38186597+Miepee@users.noreply.github.com> Date: Sun, 1 Aug 2021 20:54:48 +0200 Subject: [PATCH 03/20] Linux - Fix #48 --- objects/oIntroController.object.gmx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/objects/oIntroController.object.gmx b/objects/oIntroController.object.gmx index 4cca067..b3c92e0 100644 --- a/objects/oIntroController.object.gmx +++ b/objects/oIntroController.object.gmx @@ -27,6 +27,10 @@ 1 alarm[0] = 180; txt = get_text("Title", "ControllerRecommended"); +if (os_type == os_linux && global.opfullscreen) { + window_set_fullscreen(false); + window_set_fullscreen(true); +} From 470342174ec420a9a1196c10e0c7601b0071a907 Mon Sep 17 00:00:00 2001 From: Miepee <38186597+Miepee@users.noreply.github.com> Date: Sun, 1 Aug 2021 21:00:07 +0200 Subject: [PATCH 04/20] Add small comment --- objects/oIntroController.object.gmx | 1 + 1 file changed, 1 insertion(+) diff --git a/objects/oIntroController.object.gmx b/objects/oIntroController.object.gmx index b3c92e0..c188ed6 100644 --- a/objects/oIntroController.object.gmx +++ b/objects/oIntroController.object.gmx @@ -27,6 +27,7 @@ 1 alarm[0] = 180; txt = get_text("Title", "ControllerRecommended"); +// If on Linux, quickly toggle fullscreen to get rid of GM:S mess. Seemed to be the best place to do that. if (os_type == os_linux && global.opfullscreen) { window_set_fullscreen(false); window_set_fullscreen(true); From 178a2da60f4332b5c5c628e2338339c53e546104 Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Sun, 1 Aug 2021 16:43:48 -0500 Subject: [PATCH 05/20] Fix two crashes from previous fixes, fixes #85 --- objects/oBlobThrowerLand.object.gmx | 2 +- objects/oIntroController.object.gmx | 2 +- scripts/draw_character.gml | 32 +++++++++++++++-------------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/objects/oBlobThrowerLand.object.gmx b/objects/oBlobThrowerLand.object.gmx index 3dcd816..d47ee30 100644 --- a/objects/oBlobThrowerLand.object.gmx +++ b/objects/oBlobThrowerLand.object.gmx @@ -71,7 +71,7 @@ vulnerable = 0; var inst = instance_place(x, y, oBeam); if(inst != noone) { - if(inst.ibeam) exit + if(inst.ibeam) exit; } repeat (2) { diff --git a/objects/oIntroController.object.gmx b/objects/oIntroController.object.gmx index c188ed6..5726fe8 100644 --- a/objects/oIntroController.object.gmx +++ b/objects/oIntroController.object.gmx @@ -28,7 +28,7 @@ alarm[0] = 180; txt = get_text("Title", "ControllerRecommended"); // If on Linux, quickly toggle fullscreen to get rid of GM:S mess. Seemed to be the best place to do that. -if (os_type == os_linux && global.opfullscreen) { +if (os_type == os_linux && global.opfullscreen) { window_set_fullscreen(false); window_set_fullscreen(true); } diff --git a/scripts/draw_character.gml b/scripts/draw_character.gml index 6d8bb25..addd613 100644 --- a/scripts/draw_character.gml +++ b/scripts/draw_character.gml @@ -1,20 +1,22 @@ /// draw_character(sprite, x, y, sprite2, s2ox, s2oy, sprite3, s3ox, s3oy, s3angle, facing, color, alpha, s3show) -if ((oControl.mod_fusion) && (!oControl.msr_fusionsuit)) { // Fusion suit - if (global.currentsuit == 0) { // Power - pal_swap_set(sPalFusion0, 1, false); - } else if (global.currentsuit == 1) { // Varia - pal_swap_set(sPalFusion1, 1, false); - } else if (global.currentsuit == 2) { // Gravity - pal_swap_set(sPalFusion2, 1, false); - } -} else if (os_type != os_android) { // Custom color swaps - if (global.currentsuit == 0) { // Power - pal_swap_set(oControl.PowerPalette, 1, false); - } else if (global.currentsuit == 1) { // Varia - pal_swap_set(oControl.VariaPalette, 1, false); - } else if (global.currentsuit == 2) { // Gravity - pal_swap_set(oControl.GravityPalette, 1, false); +if (!oControl.msr_fusionsuit) { + if ((oControl.mod_fusion)) { // Fusion suit + if (global.currentsuit == 0) { // Power + pal_swap_set(sPalFusion0, 1, false); + } else if (global.currentsuit == 1) { // Varia + pal_swap_set(sPalFusion1, 1, false); + } else if (global.currentsuit == 2) { // Gravity + pal_swap_set(sPalFusion2, 1, false); + } + } else if (os_type != os_android) { // Custom color swaps + if (global.currentsuit == 0 && oControl.PowerPalette != -1) { // Power + pal_swap_set(oControl.PowerPalette, 1, false); + } else if (global.currentsuit == 1 && oControl.VariaPalette != -1) { // Varia + pal_swap_set(oControl.VariaPalette, 1, false); + } else if (global.currentsuit == 2 && oControl.GravityPalette != -1) { // Gravity + pal_swap_set(oControl.GravityPalette, 1, false); + } } } From 37afc3402979912e69bf404f011b71f93d6558c3 Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Sun, 1 Aug 2021 17:49:20 -0500 Subject: [PATCH 06/20] Fixes #88 --- objects/oOptionSeed.object.gmx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objects/oOptionSeed.object.gmx b/objects/oOptionSeed.object.gmx index daca741..9068354 100644 --- a/objects/oOptionSeed.object.gmx +++ b/objects/oOptionSeed.object.gmx @@ -70,7 +70,7 @@ draw_set_color(c_black); draw_text(x + 1, y - 3, label); //draw_text(x + textoffset + 1, y - 3, optext); var voff = 0; -for (var i = 0; i < string_length(optext) - 1; i++) { +for (var i = 0; i < string_length(optext); i++) { var str = string_char_at(optext, i + 1); draw_text(x + textoffset + (i * 7) - (4 * voff) + 1, y - 3, str); if (str == "1") voff += 1; // special case to make 1 not be super awkward From c90ff391f69293f5d107fcba8556b821b7b14abc Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Sun, 1 Aug 2021 18:44:26 -0500 Subject: [PATCH 07/20] Fixes #99 --- objects/oA6Dust.object.gmx | 14 ++++++++------ objects/oA6DustSpawner.object.gmx | 16 +++++++++------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/objects/oA6Dust.object.gmx b/objects/oA6Dust.object.gmx index 69f496e..01e496a 100644 --- a/objects/oA6Dust.object.gmx +++ b/objects/oA6Dust.object.gmx @@ -81,13 +81,15 @@ speed = random(0.5); 1 if (!fadeout) { if (image_alpha < max_alpha) image_alpha += 0.02; -} else if (image_alpha > 0) { - image_alpha -= 0.02; -} -if (image_alpha < 0) { // fix for YYC - instance_destroy(); } - +else { + if (image_alpha > 0) { + image_alpha -= 0.02; + } + else { + instance_destroy(); + } +} diff --git a/objects/oA6DustSpawner.object.gmx b/objects/oA6DustSpawner.object.gmx index 5bdfdaa..3aa3ec9 100644 --- a/objects/oA6DustSpawner.object.gmx +++ b/objects/oA6DustSpawner.object.gmx @@ -49,12 +49,14 @@ alarm[1] = 2; 1 - repeat (15) { + var x1, y1, x2, y2; + +repeat (15) { x1 = max(0, view_xview[0] - 64 - (oControl.widescreen_space/2)); y1 = max(0, view_yview[0] - 64); x2 = min(room_width, view_xview[0] + view_wview[0] + 64 + (oControl.widescreen_space/2)); y2 = min(room_height, view_yview[0] + view_hview[0] + 64); - dust = instance_create(random_range(x1, x2), random_range(y1, y2), oA6Dust); + dust = instance_create(irandom_range(x1, x2), irandom_range(y1, y2), oA6Dust); } @@ -78,11 +80,11 @@ alarm[1] = 2; 1 - x1 = max(0, view_xview[0] - 64 - (oControl.widescreen_space/2)); -y1 = max(0, view_yview[0] - 64); -x2 = min(room_width, view_xview[0] + view_wview[0] + 64 + (oControl.widescreen_space/2)); -y2 = min(room_height, view_yview[0] + view_hview[0] + 64); -instance_create(random_range(x1, x2), random_range(y1, y2), oA6Dust); + var x1 = max(0, view_xview[0] - 64 - (oControl.widescreen_space/2)), + y1 = max(0, view_yview[0] - 64), + x2 = min(room_width, view_xview[0] + view_wview[0] + 64 + (oControl.widescreen_space/2)), + y2 = min(room_height, view_yview[0] + view_hview[0] + 64); +instance_create(irandom_range(x1, x2), irandom_range(y1, y2), oA6Dust); alarm[0] = 15; From a56cd1f5d87a7722e64b24ff5711b46d3d2e92f8 Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Sun, 1 Aug 2021 22:39:45 -0500 Subject: [PATCH 08/20] Prep oTestKeys, version number for beta release --- objects/oControl.object.gmx | 4 ++-- objects/oTestKeys.object.gmx | 4 ++-- sprites/sVersionFont.sprite.gmx | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/objects/oControl.object.gmx b/objects/oControl.object.gmx index ef10209..253e77f 100644 --- a/objects/oControl.object.gmx +++ b/objects/oControl.object.gmx @@ -316,9 +316,9 @@ ini_close(); // NOT Dymanic Version Number -global.fontVersion = font_add_sprite_ext(sVersionFont, "V.0123456789", true, 1); +global.fontVersion = font_add_sprite_ext(sVersionFont, "V.0123456789B", true, 1); -global.am2r_version = "V1.5.2"; // no longer dynamic, not worth the effort to maintain - mostly because of Android oddities. +global.am2r_version = "B1.5.3"; // no longer dynamic, not worth the effort to maintain - mostly because of Android oddities. // Android global.gamestarted = 0; diff --git a/objects/oTestKeys.object.gmx b/objects/oTestKeys.object.gmx index 643c049..2a9f5fe 100644 --- a/objects/oTestKeys.object.gmx +++ b/objects/oTestKeys.object.gmx @@ -25,7 +25,7 @@ 1 - //instance_destroy(); + instance_destroy(); /// The object for debug keyboard shortcuts. Lots of them. @@ -61,7 +61,7 @@ msg_loadout = 0; 1 - //instance_destroy() + instance_destroy() if (os_type == os_android) instance_destroy(); diff --git a/sprites/sVersionFont.sprite.gmx b/sprites/sVersionFont.sprite.gmx index 583e202..ffd3f24 100644 --- a/sprites/sVersionFont.sprite.gmx +++ b/sprites/sVersionFont.sprite.gmx @@ -32,5 +32,6 @@ images\sVersionFont_9.png images\sVersionFont_10.png images\sVersionFont_11.png + images\sVersionFont_12.png From 299a4d25ba8a537d23f6ed5897681419290b6643 Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Tue, 3 Aug 2021 23:11:48 -0500 Subject: [PATCH 09/20] Fixed crashing 1.5.3indev display menu --- Configs/Default.config.gmx | 6 ++--- objects/oOptionsDisplay.object.gmx | 38 ++++++++++++++++++++---------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/Configs/Default.config.gmx b/Configs/Default.config.gmx index 84e1d5f..3ba5b23 100644 --- a/Configs/Default.config.gmx +++ b/Configs/Default.config.gmx @@ -488,7 +488,7 @@ False True False - 152 + 153 0 @@ -496,7 +496,7 @@ 1 5 - 2 + 3 0 @@ -581,7 +581,7 @@ 1 Configs\Default\windows\RunnerInstaller.nsi - 2 + 3 Configs\Default\windows\Runner_finish.bmp Configs\Default\windows\Runner_header.bmp 0 diff --git a/objects/oOptionsDisplay.object.gmx b/objects/oOptionsDisplay.object.gmx index 097d149..59fc43d 100644 --- a/objects/oOptionsDisplay.object.gmx +++ b/objects/oOptionsDisplay.object.gmx @@ -33,6 +33,10 @@ active = 0; targetY = y; timer = 0; SPACER = 16; +buttonsEnabled = true; +if (os_type != os_android && !gamepad_is_connected(global.gamepadIndex)) || (os_type == os_android && (!global.joydetected || global.compatibilitymode)) { + buttonsEnabled = false; +} view_object[0] = id; @@ -62,7 +66,9 @@ opShowMap = i++; opCounterStyle = i++; // NOTIFICATIONS opShowHints = i++; -opButtonType = i++; +if (buttonsEnabled) { + opButtonType = i++; +} opShowScans = i++; opLanguage = i++; @@ -302,7 +308,7 @@ display_reset(0, global.opvsync); if (global.curropt == opShowHints) global.ophudshowhints = !global.ophudshowhints; // Button Prompt Style - if (global.curropt == opButtonType) { + if (buttonsEnabled && global.curropt == opButtonType) { var inputMax = 5 - ((os_type == os_android) * 2); oControl.mod_buttonsconfig = wrap(oControl.mod_buttonsconfig + input, 0, inputMax); @@ -393,7 +399,9 @@ op[opShowMap].label = get_text("OptionsDisplay", "HUDMap"); op[opCounterStyle].label = get_text("OptionsDisplay", "MonsterCounter"); op[52].text = get_text("OptionsDisplay", "Title_Notifications"); op[opShowHints].label = get_text("OptionsDisplay", "Hints"); -op[opButtonType].label = get_text("ExtrasMenu", "Controller"); +if (buttonsEnabled) { + op[opButtonType].label = get_text("ExtrasMenu", "Controller"); +} op[opShowScans].label = get_text("OptionsDisplay", "ScanNotifications"); op[opLanguage].label = get_text("OptionsDisplay", "Language"); @@ -442,7 +450,9 @@ tip[opShowHUD] = get_text("OptionsDisplay", "HUDDisplay_Tip"); tip[opShowMap] = get_text("OptionsDisplay", "HUDMap_Tip"); tip[opCounterStyle] = get_text("OptionsDisplay", "MonsterCounter_Tip"); tip[opShowHints] = get_text("OptionsDisplay", "Hints_Tip"); -tip[opButtonType] = get_text("ExtrasMenu", "Controller_Tip"); +if (buttonsEnabled) { + tip[opButtonType] = get_text("ExtrasMenu", "Controller_Tip"); +} tip[opShowScans] = get_text("OptionsDisplay", "ScanNotifications_Tip"); tip[opLanguage] = get_text("OptionsDisplay", "Language_Tip"); tip[menuSize] = get_text("GlobalOptions", "ExitMain_Tip"); @@ -546,14 +556,16 @@ if (global.ophudshowhints) { } else op[opShowHints].optext = get_text("GlobalOptions", "Disabled"); // Button Display Type -switch (oControl.mod_buttonsconfig) { - case 0: op[opButtonType].optext = get_text("ExtrasMenu", "XBox"); break; - case 1: op[opButtonType].optext = get_text("ExtrasMenu", "Playstation"); break; - case 2: op[opButtonType].optext = get_text("ExtrasMenu", "NintendoPro"); break; - case 3: op[opButtonType].optext = get_text("ExtrasMenu", "SNESColored"); break; - case 4: op[opButtonType].optext = get_text("ExtrasMenu", "MOGA"); break; - case 5: op[opButtonType].optext = get_text("ExtrasMenu", "OUYA"); break; - default: op[opButtonType].optext = "[!]"; break; +if (buttonsEnabled) { + switch (oControl.mod_buttonsconfig) { + case 0: op[opButtonType].optext = get_text("ExtrasMenu", "XBox"); break; + case 1: op[opButtonType].optext = get_text("ExtrasMenu", "Playstation"); break; + case 2: op[opButtonType].optext = get_text("ExtrasMenu", "NintendoPro"); break; + case 3: op[opButtonType].optext = get_text("ExtrasMenu", "SNESColored"); break; + case 4: op[opButtonType].optext = get_text("ExtrasMenu", "MOGA"); break; + case 5: op[opButtonType].optext = get_text("ExtrasMenu", "OUYA"); break; + default: op[opButtonType].optext = "[!]"; break; + } } // Show Scans @@ -696,7 +708,7 @@ op[opShowHints].optionid = opShowHints; i++; // Button Display Type -if ((os_type != os_android && !gamepad_is_connected(global.gamepadIndex)) || (os_type == os_android && (!global.joydetected || global.compatibilitymode)) || (os_type == os_android && global.compatibilitymode)) { +if (buttonsEnabled) { op[opButtonType] = instance_create(x, y + SPACER * i, oOptionLR); op[opButtonType].label = get_text("ExtrasMenu", "Controller"); op[opButtonType].optionid = opButtonType; From 62b2ccfa23b0318e7f740f9995e0262ddfc2ef47 Mon Sep 17 00:00:00 2001 From: Miepee <38186597+Miepee@users.noreply.github.com> Date: Thu, 5 Aug 2021 00:35:15 +0200 Subject: [PATCH 10/20] Fix android palette crashes (#102) Initialized variables at the top and clearer --- scripts/load_resources.gml | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/scripts/load_resources.gml b/scripts/load_resources.gml index 15878ab..15702d9 100644 --- a/scripts/load_resources.gml +++ b/scripts/load_resources.gml @@ -36,6 +36,23 @@ if (os_type == os_linux) { } */ +// Suit Palettes, MonsterPalettesFusionOnly and Metroid Pallettes definition +oControl.PowerPalette = -1; +oControl.VariaPalette = -1; +oControl.GravityPalette = -1; + +oControl.MonsterPalettesFusionOnly = 1; + +oControl.AlphaPalette = -1; +oControl.GammaPalette = -1; +oControl.ZetaPalette = -1; +oControl.OmegaPalette = -1; +oControl.QueenPalette = -1; +oControl.ZetaBlur = -1; +oControl.QueenDead = -1; +oControl.QueenBloodDrop = -1; +oControl.QueenBloodParticle = -1; + if(os_type == os_android) exit; // "Safety Check" on Android //Area Headers @@ -112,10 +129,6 @@ file_find_close(); // ***Suit palettes*** -oControl.PowerPalette = -1; -oControl.VariaPalette = -1; -oControl.GravityPalette = -1; - if (file_exists("mods/palettes/suits/power.png")) oControl.PowerPalette = sprite_add("mods/palettes/suits/power.png", 1, false, false, 0, 0); if (file_exists("mods/palettes/suits/varia.png")) oControl.VariaPalette = sprite_add("mods/palettes/suits/varia.png", 1, false, false, 0, 0); if (file_exists("mods/palettes/suits/gravity.png")) oControl.GravityPalette = sprite_add("mods/palettes/suits/gravity.png", 1, false, false, 0, 0); @@ -256,15 +269,6 @@ ini_open("mods/palettes/monsters/config.ini"); MonsterPalettesFusionOnly = ini_read_real('PaletteMode', 'FusionOnly', 1); ini_close(); -AlphaPalette = -1; -GammaPalette = -1; -ZetaPalette = -1; -OmegaPalette = -1; -QueenPalette = -1; -ZetaBlur = -1; -QueenDead = -1; -QueenBloodDrop = -1; -QueenBloodParticle = -1; if (file_exists("mods/palettes/monsters/alpha.png")) AlphaPalette = sprite_add("mods/palettes/monsters/alpha.png", 1, false, false, 0, 0); if (file_exists("mods/palettes/monsters/gamma.png")) GammaPalette = sprite_add("mods/palettes/monsters/gamma.png", 1, false, false, 0, 0); From 93a7704ede0d5fe3f753f2ecd77e2ba6dc0a96b7 Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Wed, 4 Aug 2021 18:43:02 -0500 Subject: [PATCH 11/20] Fix credits format typo --- objects/oCreditsText.object.gmx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objects/oCreditsText.object.gmx b/objects/oCreditsText.object.gmx index f88071b..62fa2be 100644 --- a/objects/oCreditsText.object.gmx +++ b/objects/oCreditsText.object.gmx @@ -34,7 +34,7 @@ */ // Refer to key above -text = "*Another " + global.monsterStr + " 2 Remake;;;;;;;;;;;;*Producer;/Milton 'DoctorM64' Guasti;;*Graphic Design;Ramiro Negri=MichaelGabrielR;Jasper=Jack Witty;/Steve 'Sabre230' Rothlisberger;/Kirill '1Eni1' Fevralev;;*Promo Art;/Azima 'Zim' Khan;;*Writing;/James 'Ridley' Hobbs;/Paulo 'Latinlingo' Villalobos;;*Platform Engine Code;/Martin Piecyk;;*Music Composition;/Milton 'DoctorM64' Guasti;/Darren Kerwin;/Torbjørn 'Falcool' Brandrud;;*Debug;/Dragondarch=Hemse;/Esteban 'DruidVorse' Criado;/Verneri 'Naatiska' Viljanen;;*Playtesting;Jennifer Potter=Mario Crestanello;Live4Truths=Nommiin;/Torbjørn 'Falcool' Brandrud;/Nicolas 'Skol' Del Negro;Lise Trehjørningen=Gabriel Kaplan;Darren Kerwin=Robert Sephazon;;*Community Management;Dragonheart91=Ammypendent;/Karrde;;*Special Thanks;Nommiin=Tyler Rogers;Kousoru=Infinity's End;Isabelle Amponin=CapCom;/Nathan 'wickedclown' Hess;/The " + global.monsterStr + " Community;;;;*Source Code Reconstruction;/YellowAfterlife;;;;*Continued Revisions;;*Development;Gatordile=Lojemiru;/Alex 'Wanderer' Mack;;*Programming;" + global.monsterStr + "3D=Scooterboot;/Craig Kostelecky;;*Art Lead;/Dannon 'Shmegleskimo' Yates;;*Art;ShirtyScarab=Cooper Garvin;/Chris 'Messianic' Oliveira;/ChloePlz;;*Debug;Miepee=EODTex;/Esteban 'DruidVorse' Criado;/Verneri 'Naatiska' Viljanen;/Electrix;;*Localization;*Spanish;Imsu=Diegomg;*German;m3Zz=LPCaiser;Miepee=unknown;/fedprod;*Italian;LetsPlayNintendoITA=SadNES cITy e Vecna;/ReNext;*French;Atver=Vectrex28;*Russian;/DarkEspeon;*Japanese;/Gponys;*Czech;/Vectrex28;;*Special Thanks;Banjo=King Bore;Reaku the Crate=Grom PE;Sylandro=TheKhaosDemon;Iwantdevil=PixHammer;GaptGlitch=Nokbient;Nanassshy=kitronmacaron;/Jean-Samuel Pelletier;/Japanese Community;;;;*Original " + global.monsterStr + " II Staff;;*Producer;/Gunpei Yokoi;;*Director;Hiroji Kiyotake=Hiroyuki Kimura;;*Main Programmer;/Takahiro Harada;;*Programmer;Masaru Yamanaka=Masao Yamamoto;/Isao Hirano;;*Graphic Designer;Hiroji Kiyotake=Hiroyuki Kimura;;*Program Assistant;Yuzuru Ogawa=Nobuhiro Ozaki;;*Sound Programmer;/Ryohji Yoshitomi;;*Designer;Makoto Kanoh=Masafumi Sakashita;Tomoyoshi Yamane=Takehiko Hosokawa;/Yasuo Inoue;;*Debug;Masaru Okadaga=Kenji Nishizawa;Hirofumi Matsuoka=Tohru Ohsawa;Kohta Fukui=Keisuke Terasaki;Kenichi Sugino=Hitoshi Yamagami;Katsuya Yamaoe=Yuji Hori;;;;;;;;;;/In Memory of Satoru Iwata;"; +text = "*Another " + global.monsterStr + " 2 Remake;;;;;;;;;;;;*Producer;/Milton 'DoctorM64' Guasti;;*Graphic Design;Ramiro Negri=MichaelGabrielR;Jasper=Jack Witty;/Steve 'Sabre230' Rothlisberger;/Kirill '1Eni1' Fevralev;;*Promo Art;/Azima 'Zim' Khan;;*Writing;/James 'Ridley' Hobbs;/Paulo 'Latinlingo' Villalobos;;*Platform Engine Code;/Martin Piecyk;;*Music Composition;/Milton 'DoctorM64' Guasti;/Darren Kerwin;/Torbjørn 'Falcool' Brandrud;;*Debug;Dragondarch=Hemse;/Esteban 'DruidVorse' Criado;/Verneri 'Naatiska' Viljanen;;*Playtesting;Jennifer Potter=Mario Crestanello;Live4Truths=Nommiin;/Torbjørn 'Falcool' Brandrud;/Nicolas 'Skol' Del Negro;Lise Trehjørningen=Gabriel Kaplan;Darren Kerwin=Robert Sephazon;;*Community Management;Dragonheart91=Ammypendent;/Karrde;;*Special Thanks;Nommiin=Tyler Rogers;Kousoru=Infinity's End;Isabelle Amponin=CapCom;/Nathan 'wickedclown' Hess;/The " + global.monsterStr + " Community;;;;*Source Code Reconstruction;/YellowAfterlife;;;;*Continued Revisions;;*Development;Gatordile=Lojemiru;/Alex 'Wanderer' Mack;;*Programming;" + global.monsterStr + "3D=Scooterboot;/Craig Kostelecky;;*Art Lead;/Dannon 'Shmegleskimo' Yates;;*Art;ShirtyScarab=Cooper Garvin;/Chris 'Messianic' Oliveira;/ChloePlz;;*Debug;Miepee=EODTex;/Esteban 'DruidVorse' Criado;/Verneri 'Naatiska' Viljanen;/Electrix;;*Localization;*Spanish;Imsu=Diegomg;*German;m3Zz=LPCaiser;Miepee=unknown;/fedprod;*Italian;LetsPlayNintendoITA=SadNES cITy e Vecna;/ReNext;*French;Atver=Vectrex28;*Russian;/DarkEspeon;*Japanese;/Gponys;*Czech;/Vectrex28;;*Special Thanks;Banjo=King Bore;Reaku the Crate=Grom PE;Sylandro=TheKhaosDemon;Iwantdevil=PixHammer;GaptGlitch=Nokbient;Nanassshy=kitronmacaron;/Jean-Samuel Pelletier;/Japanese Community;;;;*Original " + global.monsterStr + " II Staff;;*Producer;/Gunpei Yokoi;;*Director;Hiroji Kiyotake=Hiroyuki Kimura;;*Main Programmer;/Takahiro Harada;;*Programmer;Masaru Yamanaka=Masao Yamamoto;/Isao Hirano;;*Graphic Designer;Hiroji Kiyotake=Hiroyuki Kimura;;*Program Assistant;Yuzuru Ogawa=Nobuhiro Ozaki;;*Sound Programmer;/Ryohji Yoshitomi;;*Designer;Makoto Kanoh=Masafumi Sakashita;Tomoyoshi Yamane=Takehiko Hosokawa;/Yasuo Inoue;;*Debug;Masaru Okadaga=Kenji Nishizawa;Hirofumi Matsuoka=Tohru Ohsawa;Kohta Fukui=Keisuke Terasaki;Kenichi Sugino=Hitoshi Yamagami;Katsuya Yamaoe=Yuji Hori;;;;;;;;;;/In Memory of Satoru Iwata;"; // Constants TEXT_ROWS = string_count(";", text); From 50ac5afffe99886ebfc1dc4308bb2cdb9a142c9a Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Thu, 5 Aug 2021 18:13:12 -0500 Subject: [PATCH 12/20] Revert "Merge pull request #97 from lassiterm/lojmain" This reverts commit af3b79def6c7149596c5908bd704981d4d3abcf2, reversing changes made to 56f2431085ba706c50a03a1779f806645f84740e. --- scripts/mus_stop_muted.gml | 94 +++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/scripts/mus_stop_muted.gml b/scripts/mus_stop_muted.gml index 6c43a2a..1cfc4ec 100644 --- a/scripts/mus_stop_muted.gml +++ b/scripts/mus_stop_muted.gml @@ -1,50 +1,50 @@ /// mus_stop_muted() -if (audio_is_playing(musTitle) && approximatelyZero(audio_sound_get_gain(musTitle))) audio_stop_sound(musTitle); -if (audio_is_playing(musFanfare) && approximatelyZero(audio_sound_get_gain(musFanfare))) audio_stop_sound(musFanfare); -if (audio_is_playing(musMainCave) && approximatelyZero(audio_sound_get_gain(musMainCave))) audio_stop_sound(musMainCave); -if (audio_is_playing(musMonsterAppear) && approximatelyZero(audio_sound_get_gain(musMonsterAppear))) audio_stop_sound(musMonsterAppear); -if (audio_is_playing(musAlphaFight) && approximatelyZero(audio_sound_get_gain(musAlphaFight))) audio_stop_sound(musAlphaFight); -if (audio_is_playing(musCaveAmbience) && approximatelyZero(audio_sound_get_gain(musCaveAmbience))) audio_stop_sound(musCaveAmbience); -if (audio_is_playing(musArea1A) && approximatelyZero(audio_sound_get_gain(musArea1A))) audio_stop_sound(musArea1A); -if (audio_is_playing(musArea1B) && approximatelyZero(audio_sound_get_gain(musArea1B))) audio_stop_sound(musArea1B); -if (audio_is_playing(musTester) && approximatelyZero(audio_sound_get_gain(musTester))) audio_stop_sound(musTester); -if (audio_is_playing(musAncientGuardian) && approximatelyZero(audio_sound_get_gain(musAncientGuardian))) audio_stop_sound(musAncientGuardian); -if (audio_is_playing(musItemGet) && approximatelyZero(audio_sound_get_gain(musItemGet))) audio_stop_sound(musItemGet); -if (audio_is_playing(musArea2A) && approximatelyZero(audio_sound_get_gain(musArea2A))) audio_stop_sound(musArea2A); -if (audio_is_playing(musArea2B) && approximatelyZero(audio_sound_get_gain(musArea2B))) audio_stop_sound(musArea2B); -if (audio_is_playing(musArachnus) && approximatelyZero(audio_sound_get_gain(musArachnus))) audio_stop_sound(musArachnus); -if (audio_is_playing(musArea3A) && approximatelyZero(audio_sound_get_gain(musArea3A))) audio_stop_sound(musArea3A); -if (audio_is_playing(musArea3B) && approximatelyZero(audio_sound_get_gain(musArea3B))) audio_stop_sound(musArea3B); -if (audio_is_playing(musTorizoA) && approximatelyZero(audio_sound_get_gain(musTorizoA))) audio_stop_sound(musTorizoA); -if (audio_is_playing(musTorizoB) && approximatelyZero(audio_sound_get_gain(musTorizoB))) audio_stop_sound(musTorizoB); -if (audio_is_playing(musGammaFight) && approximatelyZero(audio_sound_get_gain(musGammaFight))) audio_stop_sound(musGammaFight); -if (audio_is_playing(musMainCave2) && approximatelyZero(audio_sound_get_gain(musMainCave2))) audio_stop_sound(musMainCave2); -if (audio_is_playing(musLabAmbience) && approximatelyZero(audio_sound_get_gain(musLabAmbience))) audio_stop_sound(musLabAmbience); -if (audio_is_playing(musCaveAmbienceA4) && approximatelyZero(audio_sound_get_gain(musCaveAmbienceA4))) audio_stop_sound(musCaveAmbienceA4); -if (audio_is_playing(musArea4A) && approximatelyZero(audio_sound_get_gain(musArea4A))) audio_stop_sound(musArea4A); -if (audio_is_playing(musArea4B) && approximatelyZero(audio_sound_get_gain(musArea4B))) audio_stop_sound(musArea4B); -if (audio_is_playing(musReactor) && approximatelyZero(audio_sound_get_gain(musReactor))) audio_stop_sound(musReactor); -if (audio_is_playing(musZetaFight) && approximatelyZero(audio_sound_get_gain(musZetaFight))) audio_stop_sound(musZetaFight); -if (audio_is_playing(musArea5A) && approximatelyZero(audio_sound_get_gain(musArea5A))) audio_stop_sound(musArea5A); -if (audio_is_playing(musArea5B) && approximatelyZero(audio_sound_get_gain(musArea5B))) audio_stop_sound(musArea5B); -if (audio_is_playing(musEris) && approximatelyZero(audio_sound_get_gain(musEris))) audio_stop_sound(musEris); -if (audio_is_playing(musItemAmb) && approximatelyZero(audio_sound_get_gain(musItemAmb))) audio_stop_sound(musItemAmb); +if (audio_is_playing(musTitle) && audio_sound_get_gain(musTitle) == 0) audio_stop_sound(musTitle); +if (audio_is_playing(musFanfare) && audio_sound_get_gain(musFanfare) == 0) audio_stop_sound(musFanfare); +if (audio_is_playing(musMainCave) && audio_sound_get_gain(musMainCave) == 0) audio_stop_sound(musMainCave); +if (audio_is_playing(musMonsterAppear) && audio_sound_get_gain(musMonsterAppear) == 0) audio_stop_sound(musMonsterAppear); +if (audio_is_playing(musAlphaFight) && audio_sound_get_gain(musAlphaFight) == 0) audio_stop_sound(musAlphaFight); +if (audio_is_playing(musCaveAmbience) && audio_sound_get_gain(musCaveAmbience) == 0) audio_stop_sound(musCaveAmbience); +if (audio_is_playing(musArea1A) && audio_sound_get_gain(musArea1A) == 0) audio_stop_sound(musArea1A); +if (audio_is_playing(musArea1B) && audio_sound_get_gain(musArea1B) == 0) audio_stop_sound(musArea1B); +if (audio_is_playing(musTester) && audio_sound_get_gain(musTester) == 0) audio_stop_sound(musTester); +if (audio_is_playing(musAncientGuardian) && audio_sound_get_gain(musAncientGuardian) == 0) audio_stop_sound(musAncientGuardian); +if (audio_is_playing(musItemGet) && audio_sound_get_gain(musItemGet) == 0) audio_stop_sound(musItemGet); +if (audio_is_playing(musArea2A) && audio_sound_get_gain(musArea2A) == 0) audio_stop_sound(musArea2A); +if (audio_is_playing(musArea2B) && audio_sound_get_gain(musArea2B) == 0) audio_stop_sound(musArea2B); +if (audio_is_playing(musArachnus) && audio_sound_get_gain(musArachnus) == 0) audio_stop_sound(musArachnus); +if (audio_is_playing(musArea3A) && audio_sound_get_gain(musArea3A) == 0) audio_stop_sound(musArea3A); +if (audio_is_playing(musArea3B) && audio_sound_get_gain(musArea3B) == 0) audio_stop_sound(musArea3B); +if (audio_is_playing(musTorizoA) && audio_sound_get_gain(musTorizoA) == 0) audio_stop_sound(musTorizoA); +if (audio_is_playing(musTorizoB) && audio_sound_get_gain(musTorizoB) == 0) audio_stop_sound(musTorizoB); +if (audio_is_playing(musGammaFight) && audio_sound_get_gain(musGammaFight) == 0) audio_stop_sound(musGammaFight); +if (audio_is_playing(musMainCave2) && audio_sound_get_gain(musMainCave2) == 0) audio_stop_sound(musMainCave2); +if (audio_is_playing(musLabAmbience) && audio_sound_get_gain(musLabAmbience) == 0) audio_stop_sound(musLabAmbience); +if (audio_is_playing(musCaveAmbienceA4) && audio_sound_get_gain(musCaveAmbienceA4) == 0) audio_stop_sound(musCaveAmbienceA4); +if (audio_is_playing(musArea4A) && audio_sound_get_gain(musArea4A) == 0) audio_stop_sound(musArea4A); +if (audio_is_playing(musArea4B) && audio_sound_get_gain(musArea4B) == 0) audio_stop_sound(musArea4B); +if (audio_is_playing(musReactor) && audio_sound_get_gain(musReactor) == 0) audio_stop_sound(musReactor); +if (audio_is_playing(musZetaFight) && audio_sound_get_gain(musZetaFight) == 0) audio_stop_sound(musZetaFight); +if (audio_is_playing(musArea5A) && audio_sound_get_gain(musArea5A) == 0) audio_stop_sound(musArea5A); +if (audio_is_playing(musArea5B) && audio_sound_get_gain(musArea5B) == 0) audio_stop_sound(musArea5B); +if (audio_is_playing(musEris) && audio_sound_get_gain(musEris) == 0) audio_stop_sound(musEris); +if (audio_is_playing(musItemAmb) && audio_sound_get_gain(musItemAmb) == 0) audio_stop_sound(musItemAmb); if (file_exists("musItemAmb2.ogg")) { - if (audio_is_playing(musItemAmb2) && approximatelyZero(audio_sound_get_gain(musItemAmb2))) audio_stop_sound(musItemAmb2); + if (audio_is_playing(musItemAmb2) && audio_sound_get_gain(musItemAmb2) == 0) audio_stop_sound(musItemAmb2); } -if (audio_is_playing(musOmegaFight) && approximatelyZero(audio_sound_get_gain(musOmegaFight))) audio_stop_sound(musOmegaFight); -if (audio_is_playing(musArea6A) && approximatelyZero(audio_sound_get_gain(musArea6A))) audio_stop_sound(musArea6A); -if (audio_is_playing(musArea7A) && approximatelyZero(audio_sound_get_gain(musArea7A))) audio_stop_sound(musArea7A); -if (audio_is_playing(musArea7B) && approximatelyZero(audio_sound_get_gain(musArea7B))) audio_stop_sound(musArea7B); -if (audio_is_playing(musArea7C) && approximatelyZero(audio_sound_get_gain(musArea7C))) audio_stop_sound(musArea7C); -if (audio_is_playing(musArea7D) && approximatelyZero(audio_sound_get_gain(musArea7D))) audio_stop_sound(musArea7D); -if (audio_is_playing(musHatchling) && approximatelyZero(audio_sound_get_gain(musHatchling))) audio_stop_sound(musHatchling); -if (audio_is_playing(musQueenIntro) && approximatelyZero(audio_sound_get_gain(musQueenIntro))) audio_stop_sound(musQueenIntro); -if (audio_is_playing(musQueen) && approximatelyZero(audio_sound_get_gain(musQueen))) audio_stop_sound(musQueen); -if (audio_is_playing(musQueen2) && approximatelyZero(audio_sound_get_gain(musQueen2))) audio_stop_sound(musQueen2); -if (audio_is_playing(musQueen3) && approximatelyZero(audio_sound_get_gain(musQueen3))) audio_stop_sound(musQueen3); -if (audio_is_playing(musQueenBreak) && approximatelyZero(audio_sound_get_gain(musQueenBreak))) audio_stop_sound(musQueenBreak); -if (audio_is_playing(musCredits) && approximatelyZero(audio_sound_get_gain(musCredits))) audio_stop_sound(musCredits); -if (audio_is_playing(musIntroSeq) && approximatelyZero(audio_sound_get_gain(musIntroSeq))) audio_stop_sound(musIntroSeq); -if (audio_is_playing(musArea8) && approximatelyZero(audio_sound_get_gain(musArea8))) audio_stop_sound(musArea8); -if (audio_is_playing(musGenesis) && approximatelyZero(audio_sound_get_gain(musGenesis))) audio_stop_sound(musGenesis); +if (audio_is_playing(musOmegaFight) && audio_sound_get_gain(musOmegaFight) == 0) audio_stop_sound(musOmegaFight); +if (audio_is_playing(musArea6A) && audio_sound_get_gain(musArea6A) == 0) audio_stop_sound(musArea6A); +if (audio_is_playing(musArea7A) && audio_sound_get_gain(musArea7A) == 0) audio_stop_sound(musArea7A); +if (audio_is_playing(musArea7B) && audio_sound_get_gain(musArea7B) == 0) audio_stop_sound(musArea7B); +if (audio_is_playing(musArea7C) && audio_sound_get_gain(musArea7C) == 0) audio_stop_sound(musArea7C); +if (audio_is_playing(musArea7D) && audio_sound_get_gain(musArea7D) == 0) audio_stop_sound(musArea7D); +if (audio_is_playing(musHatchling) && audio_sound_get_gain(musHatchling) == 0) audio_stop_sound(musHatchling); +if (audio_is_playing(musQueenIntro) && audio_sound_get_gain(musQueenIntro) == 0) audio_stop_sound(musQueenIntro); +if (audio_is_playing(musQueen) && audio_sound_get_gain(musQueen) == 0) audio_stop_sound(musQueen); +if (audio_is_playing(musQueen2) && audio_sound_get_gain(musQueen2) == 0) audio_stop_sound(musQueen2); +if (audio_is_playing(musQueen3) && audio_sound_get_gain(musQueen3) == 0) audio_stop_sound(musQueen3); +if (audio_is_playing(musQueenBreak) && audio_sound_get_gain(musQueenBreak) == 0) audio_stop_sound(musQueenBreak); +if (audio_is_playing(musCredits) && audio_sound_get_gain(musCredits) == 0) audio_stop_sound(musCredits); +if (audio_is_playing(musIntroSeq) && audio_sound_get_gain(musIntroSeq) == 0) audio_stop_sound(musIntroSeq); +if (audio_is_playing(musArea8) && audio_sound_get_gain(musArea8) == 0) audio_stop_sound(musArea8); +if (audio_is_playing(musGenesis) && audio_sound_get_gain(musGenesis) == 0) audio_stop_sound(musGenesis); From abc6dfe05f69ee7049447814a4b383f92bd245de Mon Sep 17 00:00:00 2001 From: milesthenerd Date: Thu, 5 Aug 2021 18:19:01 -0500 Subject: [PATCH 13/20] Revert "Modify font loading routines" (#100) This reverts commit dc0f1a5bb14932baa9f6f7eae176d1b0ad389774. --- objects/oControl.object.gmx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/objects/oControl.object.gmx b/objects/oControl.object.gmx index 253e77f..1a53a1c 100644 --- a/objects/oControl.object.gmx +++ b/objects/oControl.object.gmx @@ -288,27 +288,27 @@ subScrItemOffset = 0; ini_open("lang/fonts/sizes.ini"); if(file_exists("lang/fonts/04b09.ttf")) { - fontGUI = font_add("lang/fonts/04b09.ttf", ini_read_real('Sizes', '04b09_(large)', 16), false, false, 32, 255); - fontSubScr = font_add("lang/fonts/04b09.ttf", ini_read_real('Sizes', '04b09_(small)', 8), false, false, 32, 255); + font_replace(fontGUI, "lang/fonts/04b09.ttf", ini_read_real('Sizes', '04b09_(large)', 16), false, false, 32, 255); + font_replace(fontSubScr, "lang/fonts/04b09.ttf", ini_read_real('Sizes', '04b09_(small)', 8), false, false, 32, 255); GUIOffset = ini_read_real('Offsets', '04b09_(large)_offset', 0); subScrHeaderOffset = ini_read_real('Offsets', '04b09_(small)_offset', 0); } if(file_exists("lang/fonts/Acknowledge_TT_BRK.ttf")) { - fontGUI2 = font_add("lang/fonts/Acknowledge_TT_BRK.ttf", ini_read_real('Sizes', 'Acknowledge_TT_BRK', 13), false, false, 32, 255); + font_replace(fontGUI2, "lang/fonts/Acknowledge_TT_BRK.ttf", ini_read_real('Sizes', 'Acknowledge_TT_BRK', 13), false, false, 32, 255); } if(file_exists("lang/fonts/uni_05_53.ttf")) { - fontMenuSmall = font_add("lang/fonts/uni_05_53.ttf", ini_read_real('Sizes', 'uni_05_53', 8), false, false, 32, 255); + font_replace(fontMenuSmall, "lang/fonts/uni_05_53.ttf", ini_read_real('Sizes', 'uni_05_53', 8), false, false, 32, 255); } if(file_exists("lang/fonts/04b24.ttf")) { - fontMenuTiny = font_add("lang/fonts/04b24.ttf", ini_read_real('Sizes', '04b24', 16), false, false, 32, 255); + font_replace(fontMenuTiny, "lang/fonts/04b24.ttf", ini_read_real('Sizes', '04b24', 16), false, false, 32, 255); subScrItemOffset = ini_read_real('Offsets', '04b24_offset', -6); } if(file_exists("lang/fonts/Glasstown_NBP.ttf")) { - fontMenuSmall2 = font_add("lang/fonts/Glasstown_NBP.ttf", ini_read_real('Sizes', 'Glasstown_NBP', 16), false, false, 32, 255); + font_replace(fontMenuSmall2, "lang/fonts/Glasstown_NBP.ttf", ini_read_real('Sizes', 'Glasstown_NBP', 16), false, false, 32, 255); } ini_close(); From 27806242b6b1e403a591a4b3bb0665e2cdb09f7e Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Thu, 5 Aug 2021 20:35:40 -0500 Subject: [PATCH 14/20] Actually fixed #1 --- objects/oMusicV2.object.gmx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/objects/oMusicV2.object.gmx b/objects/oMusicV2.object.gmx index 4acdea8..1fe2b05 100644 --- a/objects/oMusicV2.object.gmx +++ b/objects/oMusicV2.object.gmx @@ -80,9 +80,7 @@ if (file_exists("musQueenbreak.ogg") and file_exists("musQueen2.ogg") and file_e 1 - if (file_exists("musItemAmb2.ogg")) { - if(oMusicV2.currentbgm != musItemAmb2 && oMusicV2.bossbgm == sndJump) mus_stop_muted(); -} else if (oMusicV2.bossbgm == sndJump) mus_stop_muted(); + if (oMusicV2.bossbgm == sndJump) mus_stop_muted(); From ade1610145a42efeda0cb524df1769e65f540d59 Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Sat, 7 Aug 2021 20:10:54 -0500 Subject: [PATCH 15/20] Fixed tile --- rooms/rm_a5c14.room.gmx | 1 + 1 file changed, 1 insertion(+) diff --git a/rooms/rm_a5c14.room.gmx b/rooms/rm_a5c14.room.gmx index c74b0e9..4c24540 100644 --- a/rooms/rm_a5c14.room.gmx +++ b/rooms/rm_a5c14.room.gmx @@ -924,6 +924,7 @@ global.darkness = 0; + 0 0 From 4a294ed5d113149a30ce52aebf3055de38d6a671 Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Wed, 18 Aug 2021 15:59:55 -0500 Subject: [PATCH 16/20] Prep for 1.5.3 release --- objects/oControl.object.gmx | 4 ++-- objects/oTestKeys.object.gmx | 3 +++ rooms/initroom.room.gmx | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/objects/oControl.object.gmx b/objects/oControl.object.gmx index 1a53a1c..7e2b56a 100644 --- a/objects/oControl.object.gmx +++ b/objects/oControl.object.gmx @@ -25,7 +25,7 @@ 1 - global.monsterStr = "Monster"; + global.monsterStr = "monster"; randomize(); @@ -318,7 +318,7 @@ ini_close(); // NOT Dymanic Version Number global.fontVersion = font_add_sprite_ext(sVersionFont, "V.0123456789B", true, 1); -global.am2r_version = "B1.5.3"; // no longer dynamic, not worth the effort to maintain - mostly because of Android oddities. +global.am2r_version = "V1.5.3"; // no longer dynamic, not worth the effort to maintain - mostly because of Android oddities. // Android global.gamestarted = 0; diff --git a/objects/oTestKeys.object.gmx b/objects/oTestKeys.object.gmx index 2a9f5fe..6e57843 100644 --- a/objects/oTestKeys.object.gmx +++ b/objects/oTestKeys.object.gmx @@ -31,6 +31,7 @@ if (os_type == os_android) instance_destroy(); +/* targetroom = rm_a0h11; bigdisplaytest = 0; viewmode = 0; @@ -65,6 +66,8 @@ msg_loadout = 0; if (os_type == os_android) instance_destroy(); +/* + if (mouse_check_button(mb_left) && global.ingame) { oCharacter.x = mouse_x; oCharacter.y = mouse_y; diff --git a/rooms/initroom.room.gmx b/rooms/initroom.room.gmx index 843a4c3..f975938 100644 --- a/rooms/initroom.room.gmx +++ b/rooms/initroom.room.gmx @@ -53,7 +53,6 @@ - 0 From 4acd1cf1f9fb62cacb6e01021a29b721e36436b2 Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Sat, 21 Aug 2021 17:42:19 -0500 Subject: [PATCH 17/20] Fix credits, ready for actual 1.5.3 release --- objects/oCreditsText.object.gmx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objects/oCreditsText.object.gmx b/objects/oCreditsText.object.gmx index 62fa2be..2f5d835 100644 --- a/objects/oCreditsText.object.gmx +++ b/objects/oCreditsText.object.gmx @@ -34,7 +34,7 @@ */ // Refer to key above -text = "*Another " + global.monsterStr + " 2 Remake;;;;;;;;;;;;*Producer;/Milton 'DoctorM64' Guasti;;*Graphic Design;Ramiro Negri=MichaelGabrielR;Jasper=Jack Witty;/Steve 'Sabre230' Rothlisberger;/Kirill '1Eni1' Fevralev;;*Promo Art;/Azima 'Zim' Khan;;*Writing;/James 'Ridley' Hobbs;/Paulo 'Latinlingo' Villalobos;;*Platform Engine Code;/Martin Piecyk;;*Music Composition;/Milton 'DoctorM64' Guasti;/Darren Kerwin;/Torbjørn 'Falcool' Brandrud;;*Debug;Dragondarch=Hemse;/Esteban 'DruidVorse' Criado;/Verneri 'Naatiska' Viljanen;;*Playtesting;Jennifer Potter=Mario Crestanello;Live4Truths=Nommiin;/Torbjørn 'Falcool' Brandrud;/Nicolas 'Skol' Del Negro;Lise Trehjørningen=Gabriel Kaplan;Darren Kerwin=Robert Sephazon;;*Community Management;Dragonheart91=Ammypendent;/Karrde;;*Special Thanks;Nommiin=Tyler Rogers;Kousoru=Infinity's End;Isabelle Amponin=CapCom;/Nathan 'wickedclown' Hess;/The " + global.monsterStr + " Community;;;;*Source Code Reconstruction;/YellowAfterlife;;;;*Continued Revisions;;*Development;Gatordile=Lojemiru;/Alex 'Wanderer' Mack;;*Programming;" + global.monsterStr + "3D=Scooterboot;/Craig Kostelecky;;*Art Lead;/Dannon 'Shmegleskimo' Yates;;*Art;ShirtyScarab=Cooper Garvin;/Chris 'Messianic' Oliveira;/ChloePlz;;*Debug;Miepee=EODTex;/Esteban 'DruidVorse' Criado;/Verneri 'Naatiska' Viljanen;/Electrix;;*Localization;*Spanish;Imsu=Diegomg;*German;m3Zz=LPCaiser;Miepee=unknown;/fedprod;*Italian;LetsPlayNintendoITA=SadNES cITy e Vecna;/ReNext;*French;Atver=Vectrex28;*Russian;/DarkEspeon;*Japanese;/Gponys;*Czech;/Vectrex28;;*Special Thanks;Banjo=King Bore;Reaku the Crate=Grom PE;Sylandro=TheKhaosDemon;Iwantdevil=PixHammer;GaptGlitch=Nokbient;Nanassshy=kitronmacaron;/Jean-Samuel Pelletier;/Japanese Community;;;;*Original " + global.monsterStr + " II Staff;;*Producer;/Gunpei Yokoi;;*Director;Hiroji Kiyotake=Hiroyuki Kimura;;*Main Programmer;/Takahiro Harada;;*Programmer;Masaru Yamanaka=Masao Yamamoto;/Isao Hirano;;*Graphic Designer;Hiroji Kiyotake=Hiroyuki Kimura;;*Program Assistant;Yuzuru Ogawa=Nobuhiro Ozaki;;*Sound Programmer;/Ryohji Yoshitomi;;*Designer;Makoto Kanoh=Masafumi Sakashita;Tomoyoshi Yamane=Takehiko Hosokawa;/Yasuo Inoue;;*Debug;Masaru Okadaga=Kenji Nishizawa;Hirofumi Matsuoka=Tohru Ohsawa;Kohta Fukui=Keisuke Terasaki;Kenichi Sugino=Hitoshi Yamagami;Katsuya Yamaoe=Yuji Hori;;;;;;;;;;/In Memory of Satoru Iwata;"; +text = "*Another " + global.monsterStr + " 2 Remake;;;;;;;;;;;;*Producer;/Milton 'DoctorM64' Guasti;;*Graphic Design;Ramiro Negri=MichaelGabrielR;Jasper=Jack Witty;/Steve 'Sabre230' Rothlisberger;/Kirill '1Eni1' Fevralev;;*Promo Art;/Azima 'Zim' Khan;;*Writing;/James 'Ridley' Hobbs;/Paulo 'Latinlingo' Villalobos;;*Platform Engine Code;/Martin Piecyk;;*Music Composition;/Milton 'DoctorM64' Guasti;/Darren Kerwin;/Torbjørn 'Falcool' Brandrud;;*Debug;Dragondarch=Hemse;/Esteban 'DruidVorse' Criado;/Verneri 'Naatiska' Viljanen;;*Playtesting;Jennifer Potter=Mario Crestanello;Live4Truths=Nommiin;/Torbjørn 'Falcool' Brandrud;/Nicolas 'Skol' Del Negro;Lise Trehjørningen=Gabriel Kaplan;Darren Kerwin=Robert Sephazon;;*Community Management;Dragonheart91=Ammypendent;/Karrde;;*Special Thanks;Nommiin=Tyler Rogers;Kousoru=Infinity's End;Isabelle Amponin=CapCom;/Nathan 'wickedclown' Hess;/The " + global.monsterStr + " Community;;;;*Source Code Reconstruction;/YellowAfterlife;;;;*Continued Revisions;;*Development;Gatordile=Lojemiru;/Alex 'Wanderer' Mack;;*Programming;" + global.monsterStr + "3D=Scooterboot;/Craig Kostelecky;;*Art Lead;/Dannon 'Shmegleskimo' Yates;;*Art;ShirtyScarab=Cooper Garvin;/Chris 'Messianic' Oliveira;/ChloePlz;;*Debug;Miepee=EODTex;/Esteban 'DruidVorse' Criado;/Verneri 'Naatiska' Viljanen;/Electrix;;*Localization;Imsu=Diegomg;m3Zz=LPCaiser;Miepee=unknown;fedprod=ReNext;LetsPlayNintendoITA=SadNES cITy e Vecna;Atver=Gponys;DarkEspeon=Vectrex28;R3VOWOOD=Ritinha;LiveLM=pMega0n;peachflavored=Katherine_S2003;PanHooHa=realgard;Mister Bond=joe_urahara;RippeR1692=LudvigNG;/Andréas;;*Special Thanks;Banjo=King Bore;Reaku the Crate=Grom PE;Sylandro=TheKhaosDemon;Iwantdevil=PixHammer;GaptGlitch=Nokbient;Nanassshy=kitronmacaron;/Jean-Samuel Pelletier;/Japanese Community;;;;*Original " + global.monsterStr + " II Staff;;*Producer;/Gunpei Yokoi;;*Director;Hiroji Kiyotake=Hiroyuki Kimura;;*Main Programmer;/Takahiro Harada;;*Programmer;Masaru Yamanaka=Masao Yamamoto;/Isao Hirano;;*Graphic Designer;Hiroji Kiyotake=Hiroyuki Kimura;;*Program Assistant;Yuzuru Ogawa=Nobuhiro Ozaki;;*Sound Programmer;/Ryohji Yoshitomi;;*Designer;Makoto Kanoh=Masafumi Sakashita;Tomoyoshi Yamane=Takehiko Hosokawa;/Yasuo Inoue;;*Debug;Masaru Okadaga=Kenji Nishizawa;Hirofumi Matsuoka=Tohru Ohsawa;Kohta Fukui=Keisuke Terasaki;Kenichi Sugino=Hitoshi Yamagami;Katsuya Yamaoe=Yuji Hori;;;;;;;;;;/In Memory of Satoru Iwata;"; // Constants TEXT_ROWS = string_count(";", text); From 37b98e63c3fe6251b6861a4a5c8eb393886ccb8f Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Thu, 2 Sep 2021 16:41:32 -0500 Subject: [PATCH 18/20] Update for VM changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b76688e..adbc7c4 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ This repository, being based on YellowAfterlife's source reconstruction, is inst 1. Download everything from the requirements section above. 2. Download and extract [this repository](https://github.com/AM2R-Community-Developers/AM2R-Community-Updates/archive/refs/heads/main.zip) somewhere. -3. Go to where you have your AM2Rlauncher located, then into the `Profiles` folder, and after that the `Community Updates (Latest)`. Place the `AM2R.exe` file from there into the project directory. +3. Go to where you have your AM2Rlauncher located, then into the `Profiles` folder, and after that the `Community Updates (Latest)`. Place the `data.win` file from there into the project directory. ![https://cdn.discordapp.com/attachments/509717926807601182/841708939980570655/unknown.png](https://cdn.discordapp.com/attachments/509717926807601182/841708939980570655/unknown.png) 4. Drag the `AM2R.exe` file onto the GmxDataSync executable. If everything is correct, this will populate the project with art/audio assets from the binary. ![https://cdn.discordapp.com/attachments/509717926807601182/841709919542706176/unknown.png](https://cdn.discordapp.com/attachments/509717926807601182/841709919542706176/unknown.png) From 5c5f45ca1346e5cfc965b03da0208da1b3c4fb7d Mon Sep 17 00:00:00 2001 From: Lojemiru <33508026+Lojemiru@users.noreply.github.com> Date: Sat, 20 Nov 2021 18:12:02 -0600 Subject: [PATCH 19/20] update instructions for VM compile --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index adbc7c4..266cced 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ This repository, being based on YellowAfterlife's source reconstruction, is inst 2. Download and extract [this repository](https://github.com/AM2R-Community-Developers/AM2R-Community-Updates/archive/refs/heads/main.zip) somewhere. 3. Go to where you have your AM2Rlauncher located, then into the `Profiles` folder, and after that the `Community Updates (Latest)`. Place the `data.win` file from there into the project directory. ![https://cdn.discordapp.com/attachments/509717926807601182/841708939980570655/unknown.png](https://cdn.discordapp.com/attachments/509717926807601182/841708939980570655/unknown.png) -4. Drag the `AM2R.exe` file onto the GmxDataSync executable. If everything is correct, this will populate the project with art/audio assets from the binary. +4. Drag the `data.win` file onto the GmxDataSync executable. If everything is correct, this will populate the project with art/audio assets from the binary. ![https://cdn.discordapp.com/attachments/509717926807601182/841709919542706176/unknown.png](https://cdn.discordapp.com/attachments/509717926807601182/841709919542706176/unknown.png) 5. Replace the two blank shader assets with default GM:S shader skeletons or your own copy of each shader, as well as the accompanying script files for the Retro Palette Swapper: `pal_swap_init_system` and `pal_swap_set`. **WARNING:** If the two above scripts are not replaced *before* opening the project file, GM:S 1.4 will replace them with `` references in the asset tree at `Scripts/Lojical/Shaders/`. This will produce numerous seemingly unrelated errors until they are deleted and replaced with the appropriately named scripts. From ac0668941d60a721bbac65b631fbd5d46a79b2da Mon Sep 17 00:00:00 2001 From: Jesright73 <79653967+Jesright73@users.noreply.github.com> Date: Tue, 11 Jan 2022 17:57:54 -0500 Subject: [PATCH 20/20] Set default Fusion Style to "Default" (#112) Currently, the default Fusion Style setting when game first initializes on a system is "M:SR". This commit sets it to "Default" --- scripts/scr_load_mods.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_load_mods.gml b/scripts/scr_load_mods.gml index 70d2369..9b5fdd4 100644 --- a/scripts/scr_load_mods.gml +++ b/scripts/scr_load_mods.gml @@ -37,7 +37,7 @@ oControl.mod_lowhealthwarning = 1; oControl.mod_earlybaby = 0; oControl.mod_fusion = 0; oControl.mod_diffmult = 1; -oControl.msr_fusionsuit = 1; +oControl.msr_fusionsuit = 0; oControl.mod_suitchangecheat = 0; oControl.chozomessage = 0; global.chozo_message_item_id = -1;