diff --git a/objects/oClient.object.gmx b/objects/oClient.object.gmx index 54550f5..36fd77e 100644 --- a/objects/oClient.object.gmx +++ b/objects/oClient.object.gmx @@ -167,7 +167,7 @@ update_variables("initprev"); update_variables("onlinevars"); -if(shader_is_compiled(shd_pal_swapper)){ +if(global.shaders_compiled){ alpha = 1 } else { alpha = 0.5 diff --git a/objects/oHatchling.object.gmx b/objects/oHatchling.object.gmx index 064514e..b7b8d04 100644 --- a/objects/oHatchling.object.gmx +++ b/objects/oHatchling.object.gmx @@ -282,7 +282,9 @@ mealtimer += 1; draw_sprite_ext(sprite_index, -1, x, y, 1, 1, 0, -1, flash); draw_set_blend_mode(bm_normal); } else { - pal_swap_set(sPalMultitroidBaby, myid, false); + if(global.shaders_compiled){ + pal_swap_set(sPalMultitroidBaby, myid, false); + } draw_self(); draw_sprite_ext(sprite_index, -1, x, y, 1, 1, 0, -1, flash); pal_swap_reset(); diff --git a/objects/oMAlpha.object.gmx b/objects/oMAlpha.object.gmx index b2b914f..7236ff1 100644 --- a/objects/oMAlpha.object.gmx +++ b/objects/oMAlpha.object.gmx @@ -1050,7 +1050,7 @@ if (sfx_isplaying(sndMAlphaIntro)) sfx_stop(sndMAlphaIntro); 1 -if((oControl.mod_fusion == 1) || (oControl.MonsterPalettesFusionOnly == 0)) { +if((oControl.mod_fusion == 1) || (oControl.MonsterPalettesFusionOnly == 0 && global.shaders_compiled)) { pal_swap_set(oControl.AlphaPalette, 1, false); } diff --git a/objects/oMAlphaTriggerA2.object.gmx b/objects/oMAlphaTriggerA2.object.gmx index e5d4062..1e4facf 100644 --- a/objects/oMAlphaTriggerA2.object.gmx +++ b/objects/oMAlphaTriggerA2.object.gmx @@ -231,7 +231,7 @@ instance_destroy(); 1 -if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { +if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && global.shaders_compiled) { pal_swap_set(oControl.AlphaPalette, 1, false); } diff --git a/objects/oMAlphaTriggerA3AL.object.gmx b/objects/oMAlphaTriggerA3AL.object.gmx index 5713c0f..161f85b 100644 --- a/objects/oMAlphaTriggerA3AL.object.gmx +++ b/objects/oMAlphaTriggerA3AL.object.gmx @@ -156,7 +156,7 @@ instance_destroy(); 1 -if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { +if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && global.shaders_compiled) { pal_swap_set(oControl.AlphaPalette, 1, false); } diff --git a/objects/oMAlphaTriggerFirstCocoon.object.gmx b/objects/oMAlphaTriggerFirstCocoon.object.gmx index e999cce..e773313 100644 --- a/objects/oMAlphaTriggerFirstCocoon.object.gmx +++ b/objects/oMAlphaTriggerFirstCocoon.object.gmx @@ -172,7 +172,7 @@ with (oControl) event_user(2); 1 -if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { +if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && global.shaders_compiled) { pal_swap_set(oControl.AlphaPalette, 1, false); } diff --git a/objects/oMAlphaTriggerProx.object.gmx b/objects/oMAlphaTriggerProx.object.gmx index eef8884..d3662f6 100644 --- a/objects/oMAlphaTriggerProx.object.gmx +++ b/objects/oMAlphaTriggerProx.object.gmx @@ -181,7 +181,7 @@ instance_destroy(); 1 - if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { + if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && global.shaders_compiled) { pal_swap_set(oControl.AlphaPalette, 1, false); } diff --git a/objects/oMGamma.object.gmx b/objects/oMGamma.object.gmx index 9ff5d58..d4117cc 100644 --- a/objects/oMGamma.object.gmx +++ b/objects/oMGamma.object.gmx @@ -1244,7 +1244,7 @@ if (sfx_isplaying(sndMAlphaIntro)) sfx_stop(sndMAlphaIntro); 1 -if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { +if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && global.shaders_compiled) { pal_swap_set(oControl.GammaPalette, 1, false); } diff --git a/objects/oMGammaMutate.object.gmx b/objects/oMGammaMutate.object.gmx index 8e906c6..2e98afe 100644 --- a/objects/oMGammaMutate.object.gmx +++ b/objects/oMGammaMutate.object.gmx @@ -130,7 +130,7 @@ statetime += 1; 1 -if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { +if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && global.shaders_compiled) { pal_swap_set(oControl.GammaPalette, 1, false); } diff --git a/objects/oMGammaTriggerProx.object.gmx b/objects/oMGammaTriggerProx.object.gmx index 98afcb8..9302091 100644 --- a/objects/oMGammaTriggerProx.object.gmx +++ b/objects/oMGammaTriggerProx.object.gmx @@ -205,7 +205,7 @@ legbb2y = lengthdir_y(12, currentangle + 256); 1 -if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { +if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && global.shaders_compiled) { pal_swap_set(oControl.GammaPalette, 1, false); } diff --git a/objects/oMOmega.object.gmx b/objects/oMOmega.object.gmx index 2df9fee..e7c8fcb 100644 --- a/objects/oMOmega.object.gmx +++ b/objects/oMOmega.object.gmx @@ -1784,7 +1784,7 @@ if (myhealth > 0) { 1 -if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { +if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && global.shaders_compiled) { pal_swap_set(oControl.OmegaPalette, 1, false); } diff --git a/objects/oMOmegaTail.object.gmx b/objects/oMOmegaTail.object.gmx index 408dff8..ae76276 100644 --- a/objects/oMOmegaTail.object.gmx +++ b/objects/oMOmegaTail.object.gmx @@ -87,7 +87,7 @@ if (timer > 9999999) timer = 0; 1 -if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { +if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && global.shaders_compiled) { pal_swap_set(oControl.OmegaPalette, 1, false); } diff --git a/objects/oMOmegaTailMutate.object.gmx b/objects/oMOmegaTailMutate.object.gmx index 051ee3f..186e65f 100644 --- a/objects/oMOmegaTailMutate.object.gmx +++ b/objects/oMOmegaTailMutate.object.gmx @@ -111,7 +111,7 @@ if (image_index == 0) { 1 -if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { +if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && global.shaders_compiled) { pal_swap_set(oControl.OmegaPalette, 1, false); } diff --git a/objects/oMZeta.object.gmx b/objects/oMZeta.object.gmx index 8e10010..9269344 100644 --- a/objects/oMZeta.object.gmx +++ b/objects/oMZeta.object.gmx @@ -1627,7 +1627,7 @@ if (myhealth > 0) { 1 -if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { +if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && global.shaders_compiled) { pal_swap_set(oControl.ZetaPalette, 1, false); } diff --git a/objects/oMZetaHead.object.gmx b/objects/oMZetaHead.object.gmx index b649218..6898b89 100644 --- a/objects/oMZetaHead.object.gmx +++ b/objects/oMZetaHead.object.gmx @@ -135,7 +135,7 @@ if (other.invincible == 0) { 1 -if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { +if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && global.shaders_compiled) { pal_swap_set(oControl.ZetaPalette, 1, false); } diff --git a/objects/oQueen.object.gmx b/objects/oQueen.object.gmx index 4bfce53..1e370e0 100644 --- a/objects/oQueen.object.gmx +++ b/objects/oQueen.object.gmx @@ -886,7 +886,7 @@ with (leg2b_obj) instance_destroy(); 1 -if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { +if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && global.shaders_compiled) { pal_swap_set(oControl.QueenPalette, 1, false); } diff --git a/objects/oQueenFront.object.gmx b/objects/oQueenFront.object.gmx index a4d75c7..f2507f1 100644 --- a/objects/oQueenFront.object.gmx +++ b/objects/oQueenFront.object.gmx @@ -99,7 +99,7 @@ fxtimer = 0; 1 -if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { +if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && global.shaders_compiled) { pal_swap_set(oControl.QueenPalette, 1, false); } diff --git a/objects/oQueenHead.object.gmx b/objects/oQueenHead.object.gmx index c028ed3..df80149 100644 --- a/objects/oQueenHead.object.gmx +++ b/objects/oQueenHead.object.gmx @@ -982,7 +982,7 @@ if (myhealth <= 0 && state != 100 && state != 50) { 1 -if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { +if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && global.shaders_compiled) { pal_swap_set(oControl.QueenPalette, 1, false); } diff --git a/objects/oQueenLegBack.object.gmx b/objects/oQueenLegBack.object.gmx index 22a2f8b..ae45f90 100644 --- a/objects/oQueenLegBack.object.gmx +++ b/objects/oQueenLegBack.object.gmx @@ -168,7 +168,7 @@ repeat (3) { 1 -if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { +if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && global.shaders_compiled) { pal_swap_set(oControl.QueenPalette, 2, false); } diff --git a/objects/oQueenLegFront.object.gmx b/objects/oQueenLegFront.object.gmx index ecde7d7..173ee4c 100644 --- a/objects/oQueenLegFront.object.gmx +++ b/objects/oQueenLegFront.object.gmx @@ -270,7 +270,7 @@ repeat (3) { 1 -if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { +if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 && global.shaders_compiled) { pal_swap_set(oControl.QueenPalette, 2, false); } diff --git a/scripts/draw_character.gml b/scripts/draw_character.gml index 1a0f003..4de5538 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 { // 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(global.shaders_compiled){ + 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 { // 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); + } } } diff --git a/scripts/draw_character_ext.gml b/scripts/draw_character_ext.gml index 0fe682e..38ff8e1 100644 --- a/scripts/draw_character_ext.gml +++ b/scripts/draw_character_ext.gml @@ -1,36 +1,45 @@ /// draw_character_ext(sprite, x, y, sprite2, s2ox, s2oy, sprite3, s3ox, s3oy, s3angle, facing, color, alpha, s3show, arrID) var ID = argument15; -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 { // 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(global.shaders_compiled){ + 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 { // 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.mod_fusion){ - pal_swap_set(sPalMultitroidFusion, ID, false); -} else { - pal_swap_set(sPalMultitroidNew, ID, false); +if(global.shaders_compiled){ + if(oControl.mod_fusion){ + pal_swap_set(sPalMultitroidFusion, ID, false); + } else { + pal_swap_set(sPalMultitroidNew, ID, false); + } } draw_sprite_ext(argument0, argument14, argument1, argument2, argument10, 1, 0, argument11, argument12); draw_sprite_ext(argument3, argument14, argument1 + argument4, argument2 + argument5, argument10, 1, 0, argument11, argument12); -pal_swap_set(sPalMultitroidNew, ID, false); +if(global.shaders_compiled){ + pal_swap_set(sPalMultitroidNew, ID, false); +} if (argument13 == 1) { draw_sprite_ext(argument6, argument14, argument1 + argument7, argument2 + argument8, argument10, 1, argument9, argument11, argument12); } shader_reset(); -pal_swap_reset(); + +if(global.shaders_compiled){ + pal_swap_reset(); +}