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 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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