Skip to content

Commit

Permalink
got an idea for a wega notetype & difficulty, will do later
Browse files Browse the repository at this point in the history
  • Loading branch information
charlesisfeline committed Oct 20, 2024
1 parent be9c25d commit 2c1c43c
Show file tree
Hide file tree
Showing 12 changed files with 50 additions and 20 deletions.
1 change: 1 addition & 0 deletions TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ some stuff i finna add eventually/soon lol
- [ ] Unhardcode more of the intro besides `introText.txt`
- [ ] Finish credits list menu
- [ ] Extra key support
- [ ] WEGA NOTETYPE!!!!!!!!
- [ ] Improve caching for sprites and audio
- [ ] Make `LoadingState` work outside of the `html5` target
- [ ] LO-FI & HI-FI mode (kinda like Mic'd Up's implementation but cooler)
Expand Down
Binary file removed art/Funkin.bmp
Binary file not shown.
Binary file removed art/FunkinAlt.bmp
Binary file not shown.
5 changes: 5 additions & 0 deletions art/WEGA IDEA.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- secret wega song, can only be found through a prompt substate like Updike
- wega difficulty???
- the secret code will be randomized per session (WEGA00000 - WEGA99999, and it wont work unless you have beaten story mode
- hitting/missing a PATENTED wega note will blast your speakers with a wega jumpscare
- 100x worse when trying to press the charting keybind
Binary file removed art/thumbnailNewer.png
Binary file not shown.
18 changes: 10 additions & 8 deletions assets/preload/data/credits.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
]
},
{
"header": "Artists",
"header": "Artists & Animators",
"body": [
{ "line": "charlesisfeline" },
{ "line": "TheAnimateMan" },
Expand All @@ -35,6 +35,10 @@
{ "line": "Vencerist" }
]
},
{
"header": "Programming",
"body": [{ "line": "charlesisfeline" }, { "line": "Moxie-Coder" }]
},
{
"header": "Charting",
"body": [{ "line": "charlesisfeline" }, { "line": "Vencerist" }]
Expand All @@ -51,7 +55,7 @@
{ "line": "FreyaFennec_Foxes" },
{ "line": "Ren/Kasper" },
{ "line": "Isaiah Mods" },
{ "line": "DerpMage" }
{ "line": "Rem_ix / DerpMage" }
]
},
{
Expand All @@ -65,13 +69,11 @@
{ "line": "bennyk" },
{ "line": "richTrash21" },
{ "line": "Redar13" },
{ "line": "CATZALONG" },
{ "line": "Kenward03" },
{ "line": "And the Freya/Flispy Discord servers" }
]
},
{
"header": "Programming",
"body": [{ "line": "charlesisfeline" }, { "line": "Moxie-Coder" }]
},
{
"header": "Friday Night Funkin'",
"body": [
Expand All @@ -90,15 +92,15 @@
},
{
"header": "Direction and Art Lead",
"body": [{ "line": "PhantomArcade" }]
"body": [{ "line": "David “PhantomArcade” Brown" }]
},
{
"header": "Music Lead",
"body": [{ "line": "Isaac “Kawai Sprite” Garcia" }]
},
{
"header": "Co-Direction and Programming Lead",
"body": [{ "line": "ninjamuffin99" }]
"body": [{ "line": "Cameron “ninjamuffin99” Taylor" }]
},
{
"header": "Producer",
Expand Down
5 changes: 5 additions & 0 deletions buildNoTest.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
@echo off
lime build windows -DDAMNWTF
echo.
echo FINISHED COMPILING FREYA MOD!
pause
pwd
explorer.exe export\release\windows\bin
4 changes: 4 additions & 0 deletions buildShit.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
@echo off
lime test windows -DDAMNWTF
echo FREYA MOD CLOSED!
pause
pwd
explorer.exe export\release\windows\bin
6 changes: 6 additions & 0 deletions buildToCubical.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@echo off
lime test windows -DSONG=cubical -DDAMNWTF
echo FREYA MOD CLOSED!
pause
pwd
explorer.exe export\release\windows\bin
4 changes: 4 additions & 0 deletions buildToFreyin.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
@echo off
lime test windows -DSONG=freyin -DDAMNWTF
echo FREYA MOD CLOSED!
pause
pwd
explorer.exe export\release\windows\bin
6 changes: 6 additions & 0 deletions buildToIntolerant.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@echo off
lime test windows -DSONG=intolerant -DDAMNWTF
echo FREYA MOD CLOSED!
pause
pwd
explorer.exe export\release\windows\bin
21 changes: 9 additions & 12 deletions source/funkin/play/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ class PlayState extends MusicBeatSubState
["its fine bud", 0.6], // From 60% to 69%
["haha 69 funni number", 0.69], // From 69% to 70%
["git gud", 0.75], // From 70% to 80%
["is that all you got", 0.8], // From 80% to 90%
["HELP", 0.8], // From 80% to 90%
["SLAY", 0.9], // From 90% to 97%
["BRO IS NOT PFCING :skull:", 0.97], // From 97% to 99%
["PERFECT FC!!!!!!!", 1]
Expand Down Expand Up @@ -668,12 +668,14 @@ class PlayState extends MusicBeatSubState
* Returns true if game is compiled for mobile.
* It is needed for mobile checks in HScript.
*/
var isMobilePlatform:Bool = #if mobile true #else false #end;
public var isMobilePlatform:Bool = #if mobile true #else false #end;

public var isFreyaSong:Bool = false;

var randImage:Int = 1;

public var centerStrums:Bool = false;

/**
* PROPERTIES
*/
Expand Down Expand Up @@ -755,19 +757,14 @@ class PlayState extends MusicBeatSubState
super();

// Validate parameters.
if (params == null && lastParams == null)
{
throw 'PlayState constructor called with no available parameters.';
}
if (params == null && lastParams == null) throw 'PlayState constructor called with no available parameters.';
else if (params == null)
{
trace('WARNING: PlayState constructor called with no parameters. Reusing previous parameters.');
params = lastParams;
}
else
{
lastParams = params;
}

// Apply parameters.
currentSong = params.targetSong;
Expand All @@ -793,7 +790,7 @@ class PlayState extends MusicBeatSubState
*/
public override function create():Void
{
if (instance != null) trace('WARNING: PlayState instance already exists. This should not happen.'); // TODO: Do something in this case? IDK.
if (instance != null) trace('WARNING: THERES ALREADY AN INSTANCE OF PLAYSTATE, THIS AINT ON PURPOSE HELP'); // TODO: Do something in this case? IDK.
instance = this;

if (!assertChartExists()) return;
Expand Down Expand Up @@ -1828,7 +1825,7 @@ class PlayState extends MusicBeatSubState
// The score text below the health bar.
if (Preferences.extraScoreText)
{
scoreText = new FlxText(0, healthBarBG.y + 45, FlxG.width, '', 16);
scoreText = new FlxText(0, healthBarBG.y + 30, FlxG.width, '', 16);
if (isFreyaSong) scoreText.setFormat(Paths.font('roboto/roboto.ttf'), 20, FlxColor.RED, CENTER);
else
scoreText.setFormat(Paths.font('vcr.ttf'), 16, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE_FAST, FlxColor.BLACK);
Expand Down Expand Up @@ -2079,9 +2076,9 @@ class PlayState extends MusicBeatSubState

// Position the player strumline on the right half of the screen
if (Preferences.middlescroll) playerStrumline.x = FlxG.width / 2 - playerStrumline.width / 2;
else if (centerStrums) playerStrumline.x = FlxG.width - playerStrumline.width - Constants.STRUMLINE_X_OFFSET; // Centered style
else
playerStrumline.x = FlxG.width / 2 + Constants.STRUMLINE_X_OFFSET; // Classic style
// playerStrumline.x = FlxG.width - playerStrumline.width - Constants.STRUMLINE_X_OFFSET; // Centered style
playerStrumline.y = Preferences.downscroll ? FlxG.height - playerStrumline.height - Constants.STRUMLINE_Y_OFFSET : Constants.STRUMLINE_Y_OFFSET;
playerStrumline.zIndex = 1001;
playerStrumline.cameras = [camHUD];
Expand Down Expand Up @@ -2425,7 +2422,7 @@ class PlayState extends MusicBeatSubState
// TODO: Add an option for this maybe?
var commaSeparated:Bool = true;
if (Preferences.extraScoreText)
scoreText.text = '[ Score: ${FlxStringUtil.formatMoney(songScore, false, commaSeparated)} • Misses: $songMisses/$totalPlayed • Accuracy: $accuracy ]';
scoreText.text = '[ Score: ${FlxStringUtil.formatMoney(songScore, false, commaSeparated)} • Misses: $songMisses/$totalPlayed • Accuracy: $accuracy $ratingName]';
else
scoreText.text = 'Score: ${FlxStringUtil.formatMoney(songScore, false, commaSeparated)} ';
// }
Expand Down

0 comments on commit 2c1c43c

Please sign in to comment.