CoreX bug fixed

pull/116/head
sunsetbear 4 years ago
parent 16caf193d6
commit d95d2fd95b

@ -238,7 +238,7 @@ if(state == 6) {
if(image_xscale <= 0) { if(image_xscale <= 0) {
if(room == rm_a2a04) { if(room == rm_a2a04) {
with(instance_create(oCharacter.x-8, oCharacter.y-8, scr_itemsopen(oControl.mod_jumpball))) { with(instance_create(oCharacter.x-8, oCharacter.y-8, scr_itemsopen(oControl.mod_grip))) {
visible = false; visible = false;
active = 1; active = 1;
} }

@ -3334,12 +3334,14 @@ if (state == SUPERJUMP && fxtimer == 0 && sjball == 1) {
if (facing == LEFT && sjdir != 0) myspark.image_xscale = -1; if (facing == LEFT && sjdir != 0) myspark.image_xscale = -1;
} }
if (speedboostFXTimer > 0 && facing == RIGHT){ if (speedboostFXTimer > 0 && facing == RIGHT){
myspark = instance_create(x + 10, y - 12, oFXAnimSpark); myspark = instance_create(x + 12, y - 15, oFXAnimSpark);
myspark.image_angle = 0; myspark.image_angle = 0;
myspark.additive = 1;
} }
if (speedboostFXTimer > 0 && facing == LEFT){ if (speedboostFXTimer > 0 && facing == LEFT){
myspark = instance_create(x - 10, y - 12, oFXAnimSpark); myspark = instance_create(x - 12, y - 15, oFXAnimSpark);
myspark.image_angle = 180; myspark.image_angle = 180;
myspark.additive = 1;
} }
if (state == RUNNING && speedboost && (fxtimer == 0 || fxtimer == 2 || fxtimer == 4)) myspark = instance_create(x, y - random(36), oSBSpark); if (state == RUNNING && speedboost && (fxtimer == 0 || fxtimer == 2 || fxtimer == 4)) myspark = instance_create(x, y - random(36), oSBSpark);
if (onfire && fxtimer == 0) { if (onfire && fxtimer == 0) {

@ -8,6 +8,11 @@ if (isCollisionBottom(1) || isCollisionPlatformBottom(1)) {
SetSpinJumpSound(); SetSpinJumpSound();
if (state == STANDING || state == RUNNING) { if (state == STANDING || state == RUNNING) {
idle += 1; idle += 1;
if (turning == 1){
xFric = 0;
xVel *= 0.25;
xAcc = 0;
}
if (state == RUNNING && speedboost) { if (state == RUNNING && speedboost) {
if (facing == RIGHT && (kRight == 0 || kLeft > 0) || facing == LEFT && (kLeft == 0 || kRight > 0)) { if (facing == RIGHT && (kRight == 0 || kLeft > 0) || facing == LEFT && (kLeft == 0 || kRight > 0)) {
state = BRAKING; state = BRAKING;
@ -49,9 +54,11 @@ if (state == STANDING || state == RUNNING) {
if (position_meeting(x - 7, y - 8, oSolid) == false && position_meeting(x - 7, y - 24, oSolid) == false) { if (position_meeting(x - 7, y - 8, oSolid) == false && position_meeting(x - 7, y - 24, oSolid) == false) {
if (!inwater && waterfall == 0 || global.currentsuit == 2) { if (!inwater && waterfall == 0 || global.currentsuit == 2) {
if (statetime <= 5 && kLeft > 0 && turning = 0 && state == RUNNING){ if (statetime <= 5 && kLeft > 0 && turning = 0 && state == RUNNING){
if (turning == 0){
xVel = -2.2; xVel = -2.2;
//xAcc = -2.4; //xAcc = -2.4;
xFric = 1; xFric = 1;
} else xFric = 0;
} }
//hspeed = 0; //hspeed = 0;
if (statetime <= 5) xAcc -= runAcc / 8; if (statetime <= 5) xAcc -= runAcc / 8;
@ -104,9 +111,11 @@ if (state == STANDING || state == RUNNING) {
if (position_meeting(x + 7, y - 8, oSolid) == false && position_meeting(x + 7, y - 24, oSolid) == false) { if (position_meeting(x + 7, y - 8, oSolid) == false && position_meeting(x + 7, y - 24, oSolid) == false) {
if (!inwater && waterfall == 0 || global.currentsuit == 2) { if (!inwater && waterfall == 0 || global.currentsuit == 2) {
if (statetime <= 5 && turning = 0 && kRight > 0 && state == RUNNING){ if (statetime <= 5 && turning = 0 && kRight > 0 && state == RUNNING){
if (turning == 0) {
//xAcc = 2.4; //xAcc = 2.4;
xVel = 2.2; xVel = 2.2;
xFric = 1; xFric = 1;
} else xFric = 0;
} }
//hspeed = 0; //hspeed = 0;
if (statetime <= 5) xAcc += runAcc / 8; if (statetime <= 5) xAcc += runAcc / 8;
@ -2024,7 +2033,6 @@ if (state == RUNNING) {
if (dash > 0 && dash <= 25) xFric = frictionRunningX + dash * 0.0065; if (dash > 0 && dash <= 25) xFric = frictionRunningX + dash * 0.0065;
if (dash >25 && dash <=39) xFric = frictionRunningX + 25 * 0.0065; if (dash >25 && dash <=39) xFric = frictionRunningX + 25 * 0.0065;
if (dash > 39 && dash <= 45) xFric = frictionRunningX + dash * 0.006; if (dash > 39 && dash <= 45) xFric = frictionRunningX + dash * 0.006;
if (turning == 1) xFric = 0;
if (shinespark) xFric = 1; if (shinespark) xFric = 1;
} else { } else {
xFric = 1; xFric = 1;

Loading…
Cancel
Save