diff --git a/Export_Code/gml_Object_oMBTrail_Step_0.gml b/Export_Code/gml_Object_oMBTrail_Step_0.gml index 5af9d59..769984e 100644 --- a/Export_Code/gml_Object_oMBTrail_Step_0.gml +++ b/Export_Code/gml_Object_oMBTrail_Step_0.gml @@ -24,43 +24,37 @@ if (oCharacter.state == 23 || oCharacter.state == 24) sy[0] = y x = oCharacter.x y = oCharacter.y - switch oControl.mod_fusion + if oControl.mod_fusion { - case 1: - if (oControl.msr_fusionsuit == 1) - { - if (global.currentsuit == 0) - image_blend = make_color_rgb(oControl.Trail_P_R_F_SR, oControl.Trail_P_G_F_SR, oControl.Trail_P_B_F_SR) - } - else if (global.currentsuit == 0) - image_blend = make_color_rgb(oControl.Trail_P_R_F, oControl.Trail_P_G_F, oControl.Trail_P_B_F) - if (oControl.msr_fusionsuit == 1) - { - if (global.currentsuit == 1) - image_blend = make_color_rgb(oControl.Trail_V_R_F_SR, oControl.Trail_V_G_F_SR, oControl.Trail_V_B_F_SR) - } - else if (global.currentsuit == 1) - image_blend = make_color_rgb(oControl.Trail_V_R_F, oControl.Trail_V_G_F, oControl.Trail_V_B_F) - if (oControl.msr_fusionsuit == 1) - { - if (global.currentsuit == 2) - image_blend = make_color_rgb(oControl.Trail_G_R_F_SR, oControl.Trail_G_G_F_SR, oControl.Trail_G_B_F_SR) - } - else if (global.currentsuit == 2) - image_blend = make_color_rgb(oControl.Trail_G_R_F, oControl.Trail_G_G_F, oControl.Trail_G_B_F) - if global.ibeam - image_blend = make_color_rgb(255, 189, 0) - break - default: + if (oControl.msr_fusionsuit == 1) + { if (global.currentsuit == 0) - image_blend = make_color_rgb(oControl.Trail_P_R, oControl.Trail_P_G, oControl.Trail_P_B) + image_blend = make_color_rgb(oControl.Trail_P_R_F_SR, oControl.Trail_P_G_F_SR, oControl.Trail_P_B_F_SR) if (global.currentsuit == 1) - image_blend = make_color_rgb(oControl.Trail_V_R, oControl.Trail_V_G, oControl.Trail_V_B) + image_blend = make_color_rgb(oControl.Trail_V_R_F_SR, oControl.Trail_V_G_F_SR, oControl.Trail_V_B_F_SR) if (global.currentsuit == 2) - image_blend = make_color_rgb(oControl.Trail_G_R, oControl.Trail_G_G, oControl.Trail_G_B) - break + image_blend = make_color_rgb(oControl.Trail_G_R_F_SR, oControl.Trail_G_G_F_SR, oControl.Trail_G_B_F_SR) + if global.ibeam + image_blend = make_color_rgb(255, 189, 0) + } + else if global.ibeam + image_blend = make_color_rgb(oControl.Trail_O_R_F, oControl.Trail_O_G_F, oControl.Trail_O_B_F) + else if (global.currentsuit == 0) + image_blend = make_color_rgb(oControl.Trail_P_R_F, oControl.Trail_P_G_F, oControl.Trail_P_B_F) + else if (global.currentsuit == 1) + image_blend = make_color_rgb(oControl.Trail_V_R_F, oControl.Trail_V_G_F, oControl.Trail_V_B_F) + else if (global.currentsuit == 2) + image_blend = make_color_rgb(oControl.Trail_G_R_F, oControl.Trail_G_G_F, oControl.Trail_G_B_F) + } + else + { + if (global.currentsuit == 0) + image_blend = make_color_rgb(oControl.Trail_P_R, oControl.Trail_P_G, oControl.Trail_P_B) + if (global.currentsuit == 1) + image_blend = make_color_rgb(oControl.Trail_V_R, oControl.Trail_V_G, oControl.Trail_V_B) + if (global.currentsuit == 2) + image_blend = make_color_rgb(oControl.Trail_G_R, oControl.Trail_G_G, oControl.Trail_G_B) } - } else instance_destroy() diff --git a/Export_Code/gml_Object_oSpaceJumpTrail_Draw_0.gml b/Export_Code/gml_Object_oSpaceJumpTrail_Draw_0.gml index 7577c00..f59b04b 100644 --- a/Export_Code/gml_Object_oSpaceJumpTrail_Draw_0.gml +++ b/Export_Code/gml_Object_oSpaceJumpTrail_Draw_0.gml @@ -5,20 +5,20 @@ if (oControl.mod_fusion == 1) if global.ibeam { omegaTrail = 1 - draw_sprite_ext(sSpaceJumpTrail_fusion_omega, 0, x, y, image_xscale, 1, (image_angle + (image_xscale == -1 * 180)), c_white, image_alpha) + draw_sprite_ext(sSpaceJumpTrailOmega_fusion, 1, x, y, image_xscale, 1, (image_angle + (image_xscale * -180)), c_white, image_alpha) } if (!omegaTrail) { switch global.currentsuit { case 0: - draw_sprite_ext(sSpaceJumpTrail_fusion, 0, x, y, image_xscale, 1, (image_angle + (image_xscale == -1 * 180)), c_white, image_alpha) + draw_sprite_ext(sSpaceJumpTrail_fusion, 0, x, y, image_xscale, 1, (image_angle + (image_xscale * -180)), c_white, image_alpha) break case 1: - draw_sprite_ext(sSpaceJumpTrailVaria_fusion, 0, x, y, image_xscale, 1, (image_angle + (image_xscale == -1 * 180)), c_white, image_alpha) + draw_sprite_ext(sSpaceJumpTrailVaria_fusion, 0, x, y, image_xscale, 1, (image_angle + (image_xscale * -180)), c_white, image_alpha) break case 2: - draw_sprite_ext(sSpaceJumpTrailGravity_fusion, 0, x, y, image_xscale, 1, (image_angle + (image_xscale == -1 * 180)), c_white, image_alpha) + draw_sprite_ext(sSpaceJumpTrailGravity_fusion, 0, x, y, image_xscale, 1, (image_angle + (image_xscale * -180)), c_white, image_alpha) break } @@ -29,13 +29,13 @@ else switch global.currentsuit { case 0: - draw_sprite_ext(sSpaceJumpTrail, 0, x, y, image_xscale, 1, (image_angle + (image_xscale == -1 * 180)), c_white, image_alpha) + draw_sprite_ext(sSpaceJumpTrail, 0, x, y, image_xscale, 1, (image_angle + (image_xscale * -180)), c_white, image_alpha) break case 1: - draw_sprite_ext(sSpaceJumpTrailVaria, 0, x, y, image_xscale, 1, (image_angle + (image_xscale == -1 * 180)), c_white, image_alpha) + draw_sprite_ext(sSpaceJumpTrailVaria, 0, x, y, image_xscale, 1, (image_angle + (image_xscale * -180)), c_white, image_alpha) break case 2: - draw_sprite_ext(sSpaceJumpTrailGravity, 0, x, y, image_xscale, 1, (image_angle + (image_xscale == -1 * 180)), c_white, image_alpha) + draw_sprite_ext(sSpaceJumpTrailGravity, 0, x, y, image_xscale, 1, (image_angle + (image_xscale * -180)), c_white, image_alpha) break } diff --git a/Export_Code/gml_Script_characterDrawEvent.gml b/Export_Code/gml_Script_characterDrawEvent.gml index 3e3a84b..25c5e77 100644 --- a/Export_Code/gml_Script_characterDrawEvent.gml +++ b/Export_Code/gml_Script_characterDrawEvent.gml @@ -54,7 +54,7 @@ if (state == SPIDERBALL || (state == AIRBALL && sball == 1)) if global.ibeam { omegaSpider = 1 - draw_sprite_ext(sSpiderballFX_fusion, -1, x, y, 1, 1, 0, -1, (0.2 + (fxtimer * 0.1))) + draw_sprite_ext(sSpiderballFXOmega_fusion, -1, x, y, 1, 1, 0, -1, (0.2 + (fxtimer * 0.1))) } if (!omegaSpider) { diff --git a/Export_Code/gml_Script_draw_character.gml b/Export_Code/gml_Script_draw_character.gml index dbd0111..abcb056 100644 --- a/Export_Code/gml_Script_draw_character.gml +++ b/Export_Code/gml_Script_draw_character.gml @@ -5,7 +5,9 @@ if (!oControl.useselfpalette) { if oControl.mod_fusion { - if (global.currentsuit == 0) + if global.ibeam + pal_swap_set(sPalFusion3, 1, 0) + else if (global.currentsuit == 0) pal_swap_set(sPalFusion0, 1, 0) else if (global.currentsuit == 1) pal_swap_set(sPalFusion1, 1, 0) diff --git a/Export_Code/gml_Script_draw_character_ext.gml b/Export_Code/gml_Script_draw_character_ext.gml index 892defd..5e9e9e5 100644 --- a/Export_Code/gml_Script_draw_character_ext.gml +++ b/Export_Code/gml_Script_draw_character_ext.gml @@ -9,7 +9,9 @@ if (global.shaders_compiled && os_type != os_android) { if (oControl.mod_fusion && (!oControl.msr_fusionsuit)) { - if (global.currentsuit == 0) + if global.ibeam + pal_swap_set(sPalFusion3, 1, 0) + else if (global.currentsuit == 0) pal_swap_set(sPalFusion0, 1, 0) else if (global.currentsuit == 1) pal_swap_set(sPalFusion1, 1, 0) diff --git a/Export_Code/gml_Script_load_resources.gml b/Export_Code/gml_Script_load_resources.gml index 47176b4..ef3ba8d 100644 --- a/Export_Code/gml_Script_load_resources.gml +++ b/Export_Code/gml_Script_load_resources.gml @@ -118,6 +118,8 @@ if file_exists("mods/palettes/suits/fusion_varia.png") sprite_replace(sPalFusion1, "mods/palettes/suits/fusion_varia.png", 1, false, false, 0, 0) if file_exists("mods/palettes/suits/fusion_gravity.png") sprite_replace(sPalFusion2, "mods/palettes/suits/fusion_gravity.png", 1, false, false, 0, 0) +if file_exists("mods/palettes/suits/fusion_omega.png") + sprite_replace(sPalFusion3, "mods/palettes/suits/fusion_omega.png", 1, false, false, 0, 0) if file_exists("mods/palettes/suits/SpaceJumpTrails/power.png") sprite_replace(sSpaceJumpTrail, "mods/palettes/suits/SpaceJumpTrails/power.png", 1, false, false, sprite_get_xoffset(sSpaceJumpTrail), sprite_get_yoffset(sSpaceJumpTrail)) if file_exists("mods/palettes/suits/SpaceJumpTrails/varia.png") @@ -130,6 +132,8 @@ if file_exists("mods/palettes/suits/SpaceJumpTrails/fusion_varia.png") sprite_replace(sSpaceJumpTrailVaria_fusion, "mods/palettes/suits/SpaceJumpTrails/fusion_varia.png", 1, false, false, sprite_get_xoffset(sSpaceJumpTrailVaria_fusion), sprite_get_yoffset(sSpaceJumpTrailVaria_fusion)) if file_exists("mods/palettes/suits/SpaceJumpTrails/fusion_gravity.png") sprite_replace(sSpaceJumpTrailGravity_fusion, "mods/palettes/suits/SpaceJumpTrails/fusion_gravity.png", 1, false, false, sprite_get_xoffset(sSpaceJumpTrailGravity_fusion), sprite_get_yoffset(sSpaceJumpTrailGravity_fusion)) +if file_exists("mods/palettes/suits/SpaceJumpTrails/fusion_omega.png") + sprite_replace(sSpaceJumpTrailOmega_fusion, "mods/palettes/suits/SpaceJumpTrails/fusion_omega.png", 1, false, false, sprite_get_xoffset(sSpaceJumpTrailOmega_fusion), sprite_get_yoffset(sSpaceJumpTrailOmega_fusion)) if file_exists("mods/palettes/suits/SpiderBallGlow/power.png") sprite_replace(sSpiderballFX, "mods/palettes/suits/SpiderBallGlow/power.png", 1, false, false, sprite_get_xoffset(sSpiderballFX), sprite_get_yoffset(sSpiderballFX)) if file_exists("mods/palettes/suits/SpiderBallGlow/varia.png") @@ -142,6 +146,8 @@ if file_exists("mods/palettes/suits/SpiderBallGlow/fusion_varia.png") sprite_replace(sSpiderballFXVaria_fusion, "mods/palettes/suits/SpiderBallGlow/fusion_varia.png", 1, false, false, sprite_get_xoffset(sSpiderballFXVaria_fusion), sprite_get_yoffset(sSpiderballFXVaria_fusion)) if file_exists("mods/palettes/suits/SpiderBallGlow/fusion_gravity.png") sprite_replace(sSpiderballFXGravity_fusion, "mods/palettes/suits/SpiderBallGlow/fusion_gravity.png", 1, false, false, sprite_get_xoffset(sSpiderballFXGravity_fusion), sprite_get_yoffset(sSpiderballFXGravity_fusion)) +if file_exists("mods/palettes/suits/SpiderBallGlow/fusion_omega.png") + sprite_replace(sSpiderballFXOmega_fusion, "mods/palettes/suits/SpiderBallGlow/fusion_omega.png", 1, false, false, sprite_get_xoffset(sSpiderballFXOmega_fusion), sprite_get_yoffset(sSpiderballFXOmega_fusion)) surf = -1 color = -1 if (!surface_exists(surf)) @@ -207,6 +213,16 @@ if file_exists("mods/palettes/suits/MorphTrailColors/fusion_gravity.png") Trail_G_G_F = ((col >> 8) & 255) Trail_G_B_F = ((col >> 16) & 255) } +if file_exists("mods/palettes/suits/MorphTrailColors/fusion_omega.png") +{ + color = sprite_add("mods/palettes/suits/MorphTrailColors/fusion_omega.png", 1, false, false, 0, 0) + draw_clear_alpha(c_black, 0) + draw_sprite(color, 0, 0, 0) + col = surface_getpixel_ext(surf, 0, 0) + Trail_O_R_F = (col & 255) + Trail_O_G_F = ((col >> 8) & 255) + Trail_O_B_F = ((col >> 16) & 255) +} draw_clear_alpha(c_black, 0) draw_sprite(sMorphTrailPower_msr, 0, 0, 0) col = surface_getpixel_ext(surf, 0, 0)