AM2R-Mod-Sources
/
AM2R-Multitroid
mirror of https://github.com/milesthenerd/AM2R-Multitroid
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed palette check in all found places

Browse Source
pull/28/head
milesthenerd 6 years ago
parent 3650b8051e
commit b46222a6fb
22 changed files with 69 additions and 56 deletions
Show Stats Download Patch File Download Diff File

2
objects/oClient.object.gmx
Unescape View File

@ -167,7 +167,7 @@ update_variables("initprev");
update_variables("onlinevars"); update_variables("onlinevars");
if(shader_is_compiled(shd_pal_swapper)){ if(global.shaders_compiled){
alpha = 1 alpha = 1
} else { } else {
alpha = 0.5 alpha = 0.5

4
objects/oHatchling.object.gmx
Unescape View File

@ -282,7 +282,9 @@ mealtimer += 1;
draw_sprite_ext(sprite_index, -1, x, y, 1, 1, 0, -1, flash); draw_sprite_ext(sprite_index, -1, x, y, 1, 1, 0, -1, flash);
draw_set_blend_mode(bm_normal); draw_set_blend_mode(bm_normal);
} else { } else {
pal_swap_set(sPalMultitroidBaby, myid, false); if(global.shaders_compiled){
pal_swap_set(sPalMultitroidBaby, myid, false);
}
draw_self(); draw_self();
draw_sprite_ext(sprite_index, -1, x, y, 1, 1, 0, -1, flash); draw_sprite_ext(sprite_index, -1, x, y, 1, 1, 0, -1, flash);
pal_swap_reset(); pal_swap_reset();

2
objects/oMAlpha.object.gmx
Unescape View File

@ -1050,7 +1050,7 @@ if (sfx_isplaying(sndMAlphaIntro)) sfx_stop(sndMAlphaIntro);
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string> <string>
if((oControl.mod_fusion == 1) || (oControl.MonsterPalettesFusionOnly == 0)) { if((oControl.mod_fusion == 1) || (oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled)) {
pal_swap_set(oControl.AlphaPalette, 1, false); pal_swap_set(oControl.AlphaPalette, 1, false);
} }

2
objects/oMAlphaTriggerA2.object.gmx
Unescape View File

@ -231,7 +231,7 @@ instance_destroy();
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string> <string>
if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
pal_swap_set(oControl.AlphaPalette, 1, false); pal_swap_set(oControl.AlphaPalette, 1, false);
} }

2
objects/oMAlphaTriggerA3AL.object.gmx
Unescape View File

@ -156,7 +156,7 @@ instance_destroy();
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string> <string>
if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
pal_swap_set(oControl.AlphaPalette, 1, false); pal_swap_set(oControl.AlphaPalette, 1, false);
} }

2
objects/oMAlphaTriggerFirstCocoon.object.gmx
Unescape View File

@ -172,7 +172,7 @@ with (oControl) event_user(2);
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string> <string>
if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
pal_swap_set(oControl.AlphaPalette, 1, false); pal_swap_set(oControl.AlphaPalette, 1, false);
} }

2
objects/oMAlphaTriggerProx.object.gmx
Unescape View File

@ -181,7 +181,7 @@ instance_destroy();
<arguments> <arguments>
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string>if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { <string>if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
pal_swap_set(oControl.AlphaPalette, 1, false); pal_swap_set(oControl.AlphaPalette, 1, false);
} }

2
objects/oMGamma.object.gmx
Unescape View File

@ -1244,7 +1244,7 @@ if (sfx_isplaying(sndMAlphaIntro)) sfx_stop(sndMAlphaIntro);
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string> <string>
if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
pal_swap_set(oControl.GammaPalette, 1, false); pal_swap_set(oControl.GammaPalette, 1, false);
} }

2
objects/oMGammaMutate.object.gmx
Unescape View File

@ -130,7 +130,7 @@ statetime += 1;
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string> <string>
if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
pal_swap_set(oControl.GammaPalette, 1, false); pal_swap_set(oControl.GammaPalette, 1, false);
} }

2
objects/oMGammaTriggerProx.object.gmx
Unescape View File

@ -205,7 +205,7 @@ legbb2y = lengthdir_y(12, currentangle + 256);
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string> <string>
if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
pal_swap_set(oControl.GammaPalette, 1, false); pal_swap_set(oControl.GammaPalette, 1, false);
} }

2
objects/oMOmega.object.gmx
Unescape View File

@ -1784,7 +1784,7 @@ if (myhealth &gt; 0) {
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string> <string>
if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
pal_swap_set(oControl.OmegaPalette, 1, false); pal_swap_set(oControl.OmegaPalette, 1, false);
} }

2
objects/oMOmegaTail.object.gmx
Unescape View File

@ -87,7 +87,7 @@ if (timer &gt; 9999999) timer = 0;
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string> <string>
if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
pal_swap_set(oControl.OmegaPalette, 1, false); pal_swap_set(oControl.OmegaPalette, 1, false);
} }

2
objects/oMOmegaTailMutate.object.gmx
Unescape View File

@ -111,7 +111,7 @@ if (image_index == 0) {
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string> <string>
if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
pal_swap_set(oControl.OmegaPalette, 1, false); pal_swap_set(oControl.OmegaPalette, 1, false);
} }

2
objects/oMZeta.object.gmx
Unescape View File

@ -1627,7 +1627,7 @@ if (myhealth &gt; 0) {
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string> <string>
if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
pal_swap_set(oControl.ZetaPalette, 1, false); pal_swap_set(oControl.ZetaPalette, 1, false);
} }

2
objects/oMZetaHead.object.gmx
Unescape View File

@ -135,7 +135,7 @@ if (other.invincible == 0) {
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string> <string>
if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
pal_swap_set(oControl.ZetaPalette, 1, false); pal_swap_set(oControl.ZetaPalette, 1, false);
} }

2
objects/oQueen.object.gmx
Unescape View File

@ -886,7 +886,7 @@ with (leg2b_obj) instance_destroy();
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string> <string>
if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
pal_swap_set(oControl.QueenPalette, 1, false); pal_swap_set(oControl.QueenPalette, 1, false);
} }

2
objects/oQueenFront.object.gmx
Unescape View File

@ -99,7 +99,7 @@ fxtimer = 0;
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string> <string>
if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
pal_swap_set(oControl.QueenPalette, 1, false); pal_swap_set(oControl.QueenPalette, 1, false);
} }

2
objects/oQueenHead.object.gmx
Unescape View File

@ -982,7 +982,7 @@ if (myhealth &lt;= 0 &amp;&amp; state != 100 &amp;&amp; state != 50) {
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string> <string>
if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
pal_swap_set(oControl.QueenPalette, 1, false); pal_swap_set(oControl.QueenPalette, 1, false);
} }

2
objects/oQueenLegBack.object.gmx
Unescape View File

@ -168,7 +168,7 @@ repeat (3) {
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string> <string>
if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
pal_swap_set(oControl.QueenPalette, 2, false); pal_swap_set(oControl.QueenPalette, 2, false);
} }

2
objects/oQueenLegFront.object.gmx
Unescape View File

@ -270,7 +270,7 @@ repeat (3) {
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string> <string>
if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0) { if(oControl.mod_fusion == 1 || oControl.MonsterPalettesFusionOnly == 0 &amp;&amp; global.shaders_compiled) {
pal_swap_set(oControl.QueenPalette, 2, false); pal_swap_set(oControl.QueenPalette, 2, false);
} }

32
scripts/draw_character.gml
Unescape View File

@ -1,20 +1,22 @@
/// draw_character(sprite, x, y, sprite2, s2ox, s2oy, sprite3, s3ox, s3oy, s3angle, facing, color, alpha, s3show) /// 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.shaders_compiled){
if (global.currentsuit == 0) { // Power if ((oControl.mod_fusion) && (!oControl.msr_fusionsuit)) { // Fusion suit
pal_swap_set(sPalFusion0, 1, false); if (global.currentsuit == 0) { // Power
} else if (global.currentsuit == 1) { // Varia pal_swap_set(sPalFusion0, 1, false);
pal_swap_set(sPalFusion1, 1, false); } else if (global.currentsuit == 1) { // Varia
} else if (global.currentsuit == 2) { // Gravity pal_swap_set(sPalFusion1, 1, false);
pal_swap_set(sPalFusion2, 1, false); } else if (global.currentsuit == 2) { // Gravity
} pal_swap_set(sPalFusion2, 1, false);
} else { // Custom color swaps }
if (global.currentsuit == 0) { // Power } else { // Custom color swaps
pal_swap_set(oControl.PowerPalette, 1, false); if (global.currentsuit == 0) { // Power
} else if (global.currentsuit == 1) { // Varia pal_swap_set(oControl.PowerPalette, 1, false);
pal_swap_set(oControl.VariaPalette, 1, false); } else if (global.currentsuit == 1) { // Varia
} else if (global.currentsuit == 2) { // Gravity pal_swap_set(oControl.VariaPalette, 1, false);
pal_swap_set(oControl.GravityPalette, 1, false); } else if (global.currentsuit == 2) { // Gravity
pal_swap_set(oControl.GravityPalette, 1, false);
}
} }
} }

51
scripts/draw_character_ext.gml
Unescape View File

@ -1,36 +1,45 @@
/// draw_character_ext(sprite, x, y, sprite2, s2ox, s2oy, sprite3, s3ox, s3oy, s3angle, facing, color, alpha, s3show, arrID) /// draw_character_ext(sprite, x, y, sprite2, s2ox, s2oy, sprite3, s3ox, s3oy, s3angle, facing, color, alpha, s3show, arrID)
var ID = argument15; var ID = argument15;
if ((oControl.mod_fusion) && (!oControl.msr_fusionsuit)) { // Fusion suit if(global.shaders_compiled){
if (global.currentsuit == 0) { // Power if ((oControl.mod_fusion) && (!oControl.msr_fusionsuit)) { // Fusion suit
pal_swap_set(sPalFusion0, 1, false); if (global.currentsuit == 0) { // Power
} else if (global.currentsuit == 1) { // Varia pal_swap_set(sPalFusion0, 1, false);
pal_swap_set(sPalFusion1, 1, false); } else if (global.currentsuit == 1) { // Varia
} else if (global.currentsuit == 2) { // Gravity pal_swap_set(sPalFusion1, 1, false);
pal_swap_set(sPalFusion2, 1, false); } else if (global.currentsuit == 2) { // Gravity
} pal_swap_set(sPalFusion2, 1, false);
} else { // Custom color swaps }
if (global.currentsuit == 0) { // Power } else { // Custom color swaps
pal_swap_set(oControl.PowerPalette, 1, false); if (global.currentsuit == 0) { // Power
} else if (global.currentsuit == 1) { // Varia pal_swap_set(oControl.PowerPalette, 1, false);
pal_swap_set(oControl.VariaPalette, 1, false); } else if (global.currentsuit == 1) { // Varia
} else if (global.currentsuit == 2) { // Gravity pal_swap_set(oControl.VariaPalette, 1, false);
pal_swap_set(oControl.GravityPalette, 1, false); } else if (global.currentsuit == 2) { // Gravity
pal_swap_set(oControl.GravityPalette, 1, false);
}
} }
} }
if(oControl.mod_fusion){ if(global.shaders_compiled){
pal_swap_set(sPalMultitroidFusion, ID, false); if(oControl.mod_fusion){
} else { pal_swap_set(sPalMultitroidFusion, ID, false);
pal_swap_set(sPalMultitroidNew, ID, false); } else {
pal_swap_set(sPalMultitroidNew, ID, false);
}
} }
draw_sprite_ext(argument0, argument14, argument1, argument2, argument10, 1, 0, argument11, argument12); 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); 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) { if (argument13 == 1) {
draw_sprite_ext(argument6, argument14, argument1 + argument7, argument2 + argument8, argument10, 1, argument9, argument11, argument12); draw_sprite_ext(argument6, argument14, argument1 + argument7, argument2 + argument8, argument10, 1, argument9, argument11, argument12);
} }
shader_reset(); shader_reset();
pal_swap_reset();
if(global.shaders_compiled){
pal_swap_reset();
}

Write Preview
Loading…
Cancel
Save