diff --git a/assets/preload/data/turbulence/turbulence-hard.json b/assets/preload/data/turbulence/turbulence-hard.json index 2ee9421e..332792c5 100644 --- a/assets/preload/data/turbulence/turbulence-hard.json +++ b/assets/preload/data/turbulence/turbulence-hard.json @@ -6655,7 +6655,6 @@ ] ] ], - "allowBFskin": true, "player3": "gfmira", "allowGFskin": true, "song": "turbulence", diff --git a/source/PlayState.hx b/source/PlayState.hx index d161ea47..2c46a9fc 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -3773,12 +3773,18 @@ class PlayState extends MusicBeatState SONG.player1 = ClientPrefs.charOverrides[0]; } boyfriend = new Boyfriend(0, 0, SONG.player1); + if (curStage.toLowerCase() == 'turbulence' && SONG.player1 != 'bf_turb') + { + boyfriend.angle += -90; + boyfriend.scale.scale(1.3); + boyfriend.updateHitbox(); + boyfriend.cameraPosition = [0, 0]; + boyfriend.positionArray = [Math.min(0, boyfriend.positionArray[1] - 350), 0]; + var centerAttempt = Math.max(-54, (boyfriend.height - 540) / 2); + boyfriend.animOffsets = [for (i => off in boyfriend.animOffsets) i => [off[1] * 1.3, -off[0] * 1.3 + centerAttempt]]; + } startCharacterPos(boyfriend); boyfriendGroup.add(boyfriend); - //if (curStage.toLowerCase() == 'turbulence') - //{ - //boyfriendGroup.angle = -90; - //} dadGhost.visible = false; dadGhost.antialiasing = true;