diff --git a/AM2R.project.gmx b/AM2R.project.gmx index 209c908..197bddf 100644 --- a/AM2R.project.gmx +++ b/AM2R.project.gmx @@ -5325,6 +5325,7 @@ objects\oEndingHornoadFX objects\oEndingCrystalParent objects\oEndingSkip + objects\oEndingSolid diff --git a/objects/oEndingHornoad.object.gmx b/objects/oEndingHornoad.object.gmx index d6d81ae..90c8d44 100644 --- a/objects/oEndingHornoad.object.gmx +++ b/objects/oEndingHornoad.object.gmx @@ -27,7 +27,7 @@ 1 //Init -timeline_index = timelineCrystal; +timeline_index = timelineHornoad; timeline_position = 0; @@ -115,7 +115,7 @@ if(jumpLeft == 1 && sprite_index == sHornoadJump && floor(image_ ///Hornoad animations //Change to idle when landing -if(sprite_index == sHornoadJump && image_index >= 5 && place_meeting(x, y+1, oSolid)) { +if(sprite_index == sHornoadJump && image_index >= 5 && place_meeting(x, y+1, oEndingSolid)) { PlaySoundMono(sndHornoadLand); sprite_index = sHornoadIdle; image_index = 0; diff --git a/objects/oEndingSolid.object.gmx b/objects/oEndingSolid.object.gmx new file mode 100644 index 0000000..74e559d --- /dev/null +++ b/objects/oEndingSolid.object.gmx @@ -0,0 +1,52 @@ + + + sSolid + -1 + 0 + 0 + 0 + <undefined> + <undefined> + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + /// This will be fixed in 2.0. + + + + + + + -1 + 0 + 1 + 0 + 0.100000001490116 + 1 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + 0,0 + 16,0 + 16,16 + 0,16 + + diff --git a/rooms/rm_secretEnding.room.gmx b/rooms/rm_secretEnding.room.gmx index 9f85aa5..00a19dd 100644 --- a/rooms/rm_secretEnding.room.gmx +++ b/rooms/rm_secretEnding.room.gmx @@ -68,10 +68,10 @@ if (oControl.widescreen) { - - - - + + + +