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

Bugfixes

Browse Source 
Reverted morphball ground speed, removed dread slide temporarily, fixed GFS ship hardlock + sfx and music bugs
main
sunsetbear 4 years ago
parent 804923c5df
commit ace325e252
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File

2
objects/oItem.object.gmx
Unescape View File

@ -102,7 +102,7 @@ text2 = "";
<arguments> <arguments>
<argument> <argument>
<kind>1</kind> <kind>1</kind>
<string>global.item[itemid] = 2; <string>global.item[itemid] = 1;
global.itemstaken += 1; global.itemstaken += 1;
myposx = floor(x / 320); myposx = floor(x / 320);
myposy = floor((y - 8) / 240); myposy = floor((y - 8) / 240);

28
scripts/characterStepEvent.gml
Unescape View File

@ -557,7 +557,7 @@ if (state == BALL || state == AIRBALL) {
sfx_play(sndBrake); //test3 sfx_play(sndBrake); //test3
} }
facing = LEFT; facing = LEFT;
if (state == BALL && dash == 0) xVel = -4.5 /(1+walking); //added if (state == BALL && dash == 0) xVel = -6 /(1+walking); //added
//if (state == BALL && dash > 0) xVel = -10; //if (state == BALL && dash > 0) xVel = -10;
if (state == AIRBALL && dash == 0) xVel = -4.5; if (state == AIRBALL && dash == 0) xVel = -4.5;
} }
@ -572,14 +572,14 @@ if (state == BALL || state == AIRBALL) {
sfx_play(sndBrake); //test2 sfx_play(sndBrake); //test2
} }
facing = RIGHT; facing = RIGHT;
if (state == BALL && dash == 0) xVel = 4.5 /(1+walking); //added if (state == BALL && dash == 0) xVel = 6 /(1+walking); //added
//if (state == BALL && dash > 0) xVel = 10; //if (state == BALL && dash > 0) xVel = 10;
if (state == AIRBALL && dash == 0) xVel = 4.5; if (state == AIRBALL && dash == 0) xVel = 4.5;
} }
} }
if (fixedx > 0) { if (fixedx > 0) {
if (facing == RIGHT) xVel = 4.5; if (facing == RIGHT) xVel = 4;
if (facing == LEFT) xVel = -4.5; if (facing == LEFT) xVel = -4;
} }
//if (state == AIRBALL && dash > 0 && airtime > 1) { //if (state == AIRBALL && dash > 0 && airtime > 1) {
//if (facing == RIGHT) xVel = 9; //if (facing == RIGHT) xVel = 9;
@ -1326,7 +1326,7 @@ if (global.spiderball == 1 && sball == 0 && moverobj == 0 && invincible == 0 &&
} }
} }
//below is grounded morph //below is grounded morph
if (global.morphball == 1 && unmorphing == 0 && nomorph == 0 && (global.opmrpstyle == 1 && kDown && kDownPushedSteps == 0 && state == DUCKING && (global.opaimstyle == 0 && (kAim == 0 || kAim && aimdirection == 4 || kAim && aimdirection == 5) || global.opaimstyle == 1) || kMorph && kMorphPushedSteps == 0 && (state == STANDING || state == DUCKING ||(state == RUNNING && (kLeft == 0 && kRight == 0)||(global.currentsuit != 2 && (inwater == 1 || waterfall == 1)))))) { if (global.morphball == 1 && unmorphing == 0 && nomorph == 0 && (global.opmrpstyle == 1 && kDown && kDownPushedSteps == 0 && state == DUCKING && (global.opaimstyle == 0 && (kAim == 0 || kAim && aimdirection == 4 || kAim && aimdirection == 5) || global.opaimstyle == 1) || kMorph && kMorphPushedSteps == 0 && (state == STANDING || state == DUCKING || state == RUNNING))) {
state = BALL; state = BALL;
morphing = 1; morphing = 1;
image_index = 0; image_index = 0;
@ -1338,15 +1338,15 @@ if (global.morphball == 1 && unmorphing == 0 && nomorph == 0 && (global.opmrpsty
sfx_play(sndMorph); sfx_play(sndMorph);
} }
//below is dreadslide //below is dreadslide
if ((slideCooldown < 1)&& (kRight > 0 || kLeft > 0) && state == RUNNING && kMorph && kMorphPushedSteps == 0 && (global.currentsuit < 2 && inwater == 0 && waterfall == 0 || global.currentsuit == 2)){ //if ((slideCooldown < 1)&& (kRight > 0 || kLeft > 0) && state == RUNNING && kMorph && kMorphPushedSteps == 0 && (global.currentsuit < 2 && inwater == 0 && waterfall == 0 || global.currentsuit == 2)){
state = DREADSLIDE; // state = DREADSLIDE;
statetime = 0; // statetime = 0;
turning = 0; // turning = 0;
canturn = 0; // canturn = 0;
image_index = 0; // image_index = 0;
speedboost_steps = 0; // speedboost_steps = 0;
speedboost = 0; // speedboost = 0;
} //}
if (state == DREADSLIDE){ if (state == DREADSLIDE){
canturn = 0; canturn = 0;
dash = 0; dash = 0;

Write Preview
Loading…
Cancel
Save