Skip to content

Commit

Permalink
form n stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
PurSnake committed Jun 12, 2024
1 parent 8e12a4a commit c029667
Show file tree
Hide file tree
Showing 20 changed files with 4,759 additions and 4,731 deletions.
1,166 changes: 584 additions & 582 deletions source/funkin/audio/FunkinSound.hx

Large diffs are not rendered by default.

1,014 changes: 507 additions & 507 deletions source/funkin/data/song/SongRegistry.hx

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions source/funkin/play/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -3070,7 +3070,7 @@ class PlayState extends MusicBeatSubState
/**
* Resets the camera's zoom level and focus point.
*/
public function resetCamera(?resetZoom:Bool = true, ?cancelTweens:Bool = true):Void
public function resetCamera(?resetZoom:Bool = true, ?cancelTweens:Bool = true, ?snapCamera:Bool = true):Void
{
// Cancel camera tweens if any are active.
if (cancelTweens)
Expand All @@ -3083,7 +3083,8 @@ class PlayState extends MusicBeatSubState
resetCameraZoom();

// Snap the camera to the follow point immediately.
FlxG.camera.focusOn(cameraFollowPoint.getPosition());
if (snapCamera)
FlxG.camera.focusOn(cameraFollowPoint.getPosition());
}

/**
Expand Down
10 changes: 5 additions & 5 deletions source/funkin/play/ResultState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -772,11 +772,11 @@ class ResultState extends MusicBeatSubState
{
FlxTween.tween(FlxG.sound.music, {volume: 0}, 0.8);
FlxTween.tween(FlxG.sound.music, {pitch: 3}, 0.1,
{
onComplete: _ -> {
FlxTween.tween(FlxG.sound.music, {pitch: 0.5}, 0.4);
}
});
{
onComplete: _ -> {
FlxTween.tween(FlxG.sound.music, {pitch: 0.5}, 0.4);
}
});
}
if (params.storyMode)
{
Expand Down
4 changes: 2 additions & 2 deletions source/funkin/play/components/PopUpStuff.hx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class PopUpStuff extends FlxTypedGroup<FlxSprite>
super();
}

public function displayRating(daRating:String)
public dynamic function displayRating(daRating:String)
{
if (daRating == null) daRating = "good";

Expand Down Expand Up @@ -66,7 +66,7 @@ class PopUpStuff extends FlxTypedGroup<FlxSprite>
});
}

public function displayCombo(?combo:Int = 0):Int
public dynamic function displayCombo(?combo:Int = 0):Int
{
if (combo == null) combo = 0;

Expand Down
18 changes: 14 additions & 4 deletions source/funkin/play/event/FocusCameraSongEvent.hx
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ class FocusCameraSongEvent extends SongEvent
switch (ease)
{
case 'CLASSIC': // Old-school. No ease. Just set follow point.
PlayState.instance.resetCamera(false, true);
PlayState.instance.resetCamera(false, false, false);
PlayState.instance.cancelCameraFollowTween();
PlayState.instance.cameraFollowPoint.setPosition(targetX, targetY);
case 'INSTANT': // Instant ease. Duration is automatically 0.
PlayState.instance.tweenCameraToPosition(targetX, targetY, 0);
Expand Down Expand Up @@ -171,23 +172,23 @@ class FocusCameraSongEvent extends SongEvent
name: "x",
title: "X Position",
defaultValue: 0,
step: 10.0,
step: 0.5,
type: SongEventFieldType.FLOAT,
units: "px"
},
{
name: "y",
title: "Y Position",
defaultValue: 0,
step: 10.0,
step: 0.5,
type: SongEventFieldType.FLOAT,
units: "px"
},
{
name: 'duration',
title: 'Duration',
defaultValue: 4.0,
step: 0.5,
step: 0.1,
type: SongEventFieldType.FLOAT,
units: 'steps'
},
Expand All @@ -198,6 +199,12 @@ class FocusCameraSongEvent extends SongEvent
type: SongEventFieldType.ENUM,
keys: [
'Linear' => 'linear',
'Back In' => 'backIn',
'Back Out' => 'backOut',
'Back In/Out' => 'backInOut',
'Circ In' => 'circIn',
'Circ Out' => 'circOut',
'Circ In/Out' => 'circInOut',
'Sine In' => 'sineIn',
'Sine Out' => 'sineOut',
'Sine In/Out' => 'sineInOut',
Expand All @@ -219,6 +226,9 @@ class FocusCameraSongEvent extends SongEvent
'Smooth Step In' => 'smoothStepIn',
'Smooth Step Out' => 'smoothStepOut',
'Smooth Step In/Out' => 'smoothStepInOut',
'Smoother Step In' => 'smootherStepIn',
'Smoother Step Out' => 'smootherStepOut',
'Smoother Step In/Out' => 'smootherStepInOut',
'Elastic In' => 'elasticIn',
'Elastic Out' => 'elasticOut',
'Elastic In/Out' => 'elasticInOut',
Expand Down
65 changes: 37 additions & 28 deletions source/funkin/play/event/ScrollSpeedEvent.hx
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,15 @@ class ScrollSpeedEvent extends SongEvent
name: 'scroll',
title: 'Target Value',
defaultValue: 1.0,
step: 0.1,
step: 0.01,
type: SongEventFieldType.FLOAT,
units: 'x'
},
{
name: 'duration',
title: 'Duration',
defaultValue: 4.0,
step: 0.5,
step: 0.1,
type: SongEventFieldType.FLOAT,
units: 'steps'
},
Expand All @@ -126,32 +126,41 @@ class ScrollSpeedEvent extends SongEvent
defaultValue: 'linear',
type: SongEventFieldType.ENUM,
keys: [
'Linear' => 'linear',
'Instant (Ignores Duration)' => 'INSTANT',
'Sine In' => 'sineIn',
'Sine Out' => 'sineOut',
'Sine In/Out' => 'sineInOut',
'Quad In' => 'quadIn',
'Quad Out' => 'quadOut',
'Quad In/Out' => 'quadInOut',
'Cube In' => 'cubeIn',
'Cube Out' => 'cubeOut',
'Cube In/Out' => 'cubeInOut',
'Quart In' => 'quartIn',
'Quart Out' => 'quartOut',
'Quart In/Out' => 'quartInOut',
'Quint In' => 'quintIn',
'Quint Out' => 'quintOut',
'Quint In/Out' => 'quintInOut',
'Expo In' => 'expoIn',
'Expo Out' => 'expoOut',
'Expo In/Out' => 'expoInOut',
'Smooth Step In' => 'smoothStepIn',
'Smooth Step Out' => 'smoothStepOut',
'Smooth Step In/Out' => 'smoothStepInOut',
'Elastic In' => 'elasticIn',
'Elastic Out' => 'elasticOut',
'Elastic In/Out' => 'elasticInOut'
'Linear' => 'linear',
'Back In' => 'backIn',
'Back Out' => 'backOut',
'Back In/Out' => 'backInOut',
'Circ In' => 'circIn',
'Circ Out' => 'circOut',
'Circ In/Out' => 'circInOut',
'Sine In' => 'sineIn',
'Sine Out' => 'sineOut',
'Sine In/Out' => 'sineInOut',
'Quad In' => 'quadIn',
'Quad Out' => 'quadOut',
'Quad In/Out' => 'quadInOut',
'Cube In' => 'cubeIn',
'Cube Out' => 'cubeOut',
'Cube In/Out' => 'cubeInOut',
'Quart In' => 'quartIn',
'Quart Out' => 'quartOut',
'Quart In/Out' => 'quartInOut',
'Quint In' => 'quintIn',
'Quint Out' => 'quintOut',
'Quint In/Out' => 'quintInOut',
'Expo In' => 'expoIn',
'Expo Out' => 'expoOut',
'Expo In/Out' => 'expoInOut',
'Smooth Step In' => 'smoothStepIn',
'Smooth Step Out' => 'smoothStepOut',
'Smooth Step In/Out' => 'smoothStepInOut',
'Smoother Step In' => 'smootherStepIn',
'Smoother Step Out' => 'smootherStepOut',
'Smoother Step In/Out' => 'smootherStepInOut',
'Elastic In' => 'elasticIn',
'Elastic Out' => 'elasticOut',
'Elastic In/Out' => 'elasticInOut',
'Instant (Ignores duration)' => 'INSTANT'
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion source/funkin/play/event/SetCameraBopSongEvent.hx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class SetCameraBopSongEvent extends SongEvent
name: 'intensity',
title: 'Intensity',
defaultValue: 1.0,
step: 0.1,
step: 0.01,
type: SongEventFieldType.FLOAT,
units: 'x'
},
Expand Down
Loading

0 comments on commit c029667

Please sign in to comment.