cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 11:22:55 +00:00
Code Issues Releases Wiki Activity

Merge branch 'rewrite/master' into bugfix/blazin-flxanimate-fixes

Browse source
This commit is contained in:
Cameron Taylor 2024-09-05 00:31:47 -04:00
parent 24096bd319 5c44e61ce1
commit 0e37cb9540
4 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit bbf8c7d53b7560c7440efd4fb8b1d5cfa17e56b9 Subproject commit f1c74ef595a29d11544492e0dc907ba9a21d7c4f

2
source/funkin/data/stage/StageRegistry.hx
View file

@ -94,7 +94,7 @@ class StageRegistry extends BaseRegistry<Stage, StageData>
{ {
return [ return [
"mainStage", "mainStageErect", "spookyMansion", "phillyTrain", "phillyTrainErect", "limoRide", "limoRideErect", "mallXmas", "mallEvil", "school", "mainStage", "mainStageErect", "spookyMansion", "phillyTrain", "phillyTrainErect", "limoRide", "limoRideErect", "mallXmas", "mallEvil", "school",
"schoolEvil", "tankmanBattlefield", "phillyStreets", "phillyBlazin", "schoolEvil", "tankmanBattlefield", "phillyStreets", "phillyStreetsErect", "phillyBlazin",
]; ];
} }

10
source/funkin/graphics/shaders/RuntimeRainShader.hx
View file

@ -4,6 +4,7 @@ import flixel.system.FlxAssets.FlxShader;
import openfl.display.BitmapData; import openfl.display.BitmapData;
import openfl.display.ShaderParameter; import openfl.display.ShaderParameter;
import openfl.display.ShaderParameterType; import openfl.display.ShaderParameterType;
import flixel.util.FlxColor;
import openfl.utils.Assets; import openfl.utils.Assets;
typedef Light = typedef Light =
@ -94,6 +95,14 @@ class RuntimeRainShader extends RuntimePostEffectShader
return mask = value; return mask = value;
} }
public var rainColor(default, set):FlxColor;
function set_rainColor(color:FlxColor):FlxColor
{
this.setFloatArray("uRainColor", [color.red / 255, color.green / 255, color.blue / 255]);
return rainColor = color;
}
public var lightMap(default, set):BitmapData; public var lightMap(default, set):BitmapData;
function set_lightMap(value:BitmapData):BitmapData function set_lightMap(value:BitmapData):BitmapData
@ -113,6 +122,7 @@ class RuntimeRainShader extends RuntimePostEffectShader
public function new() public function new()
{ {
super(Assets.getText(Paths.frag('rain'))); super(Assets.getText(Paths.frag('rain')));
this.rainColor = 0xFF6680cc;
} }
public function update(elapsed:Float):Void public function update(elapsed:Float):Void

2
source/funkin/ui/debug/charting/ChartEditorState.hx
View file

@ -5713,7 +5713,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
PlayStatePlaylist.campaignId = 'week6'; PlayStatePlaylist.campaignId = 'week6';
case 'tankmanBattlefield': case 'tankmanBattlefield':
PlayStatePlaylist.campaignId = 'week7'; PlayStatePlaylist.campaignId = 'week7';
case 'phillyStreets' | 'phillyBlazin' | 'phillyBlazin2': case 'phillyStreets' | 'phillyStreetsErect' | 'phillyBlazin' | 'phillyBlazin2':
PlayStatePlaylist.campaignId = 'weekend1'; PlayStatePlaylist.campaignId = 'weekend1';
} }
Paths.setCurrentLevel(PlayStatePlaylist.campaignId); Paths.setCurrentLevel(PlayStatePlaylist.campaignId);