diff --git a/README.md b/README.md index d41ddbe0..57236168 100644 --- a/README.md +++ b/README.md @@ -66,8 +66,8 @@ You can check planned/upcoming features [here](/TODO). * [steve-studios](https://github.com/steve-studios) - In-Game Mod Downloader * [TheZoroForce240](https://github.com/TheZoroForce240) - Modcharting Tools Haxelib * [MAJigsaw77](https://github.com/MAJigsaw77) - ToastCore -* [KookerFoxYT](https://twitter.com/kookerfoxyt) - Old Custom Options -* [NexIsDumb](https://linktr.ee/just_nex) - New Custom Options +* [KookerFoxYT](https://twitter.com/kookerfoxyt) - Some code I borrowed +* [NexIsDumb](https://linktr.ee/just_nex) - Custom Options * [Endergreen12](https://github.com/Endergreen12) - Custom Gameplay Changers * [Verwex](https://github.com/Verwex) - Mic'd Up Paths System * [ActualMandM](https://linktr.ee/ActualMandM) - RGB Note Coloring System diff --git a/TODO b/TODO index f3d81810..b2c347a4 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,5 @@ [NEXT UPDATE] +- Week 8 (or Weekend 1, whatever) - Custom Noteskins/Notesplashes - Subtitles Event - Freeplay Search Bar @@ -8,6 +9,7 @@ - Add option for camera movement idk - Add data for languages - Fix Credits Editor +- Social Credit Check [HIGH PRIORITY] - Localization Support (basically done, but need to add data for languages) diff --git a/assets/images/credits/ender.png b/assets/images/credits/ender.png new file mode 100644 index 00000000..b7d8c55a Binary files /dev/null and b/assets/images/credits/ender.png differ diff --git a/assets/images/credits/mag.png b/assets/images/credits/mag.png index dcd4b8f9..49106503 100644 Binary files a/assets/images/credits/mag.png and b/assets/images/credits/mag.png differ diff --git a/assets/images/credits/mandm.png b/assets/images/credits/mandm.png new file mode 100644 index 00000000..59e8bc93 Binary files /dev/null and b/assets/images/credits/mandm.png differ diff --git a/assets/images/credits/neo.png b/assets/images/credits/neo.png new file mode 100644 index 00000000..8798cc8f Binary files /dev/null and b/assets/images/credits/neo.png differ diff --git a/source/meta/state/CreditsState.hx b/source/meta/state/CreditsState.hx index 7f5f2028..2586a9ed 100644 --- a/source/meta/state/CreditsState.hx +++ b/source/meta/state/CreditsState.hx @@ -60,15 +60,14 @@ class CreditsState extends MusicBeatState ['Bot 404', 'bot', 'Tiny little helper, Drew his own icon\n"expected more"', 'https://www.youtube.com/channel/UC9ntkZ4Nz3AVKrAnderJnOg', 'FF0040', 'slipperyahhfloor'], [''], ['Special Thanks'], - ['crowplexus', 'crowplexus', 'Customizable Main Menu with .JSON, Old Latin Support\nCredits Sounds\n"just happy to be here!"', 'https://github.com/crowplexus', 'a1a1a1', 'Ghost'], - ['TahirKarabekiroglu', 'tahir', 'SScript\nFunkin Cocoa Code\nSoftcoded Achievements, Replay System', 'https://github.com/TahirKarabekiroglu', 'A04397', ''], ['steve-studios', 'mag', 'In-Game Mod Downloader', 'https://github.com/steve-studios', '0000FF', 'squeak'], ['TheZoroForce240', 'zoro', 'Modcharting Tools Haxelib', 'https://github.com/TheZoroForce240', 'FFD900', 'goofyahhphone'], ['MAJigsaw77', 'jigsaw', 'ToastCore\n"Just a guy"', 'https://github.com/MAJigsaw77', '444444', ''], ['CharlesCatYT', 'charles', 'Some code I borrowed\n"your local code steale- i mean fnf haxe coder"', 'https://github.com/CharlesCatYT', '00B0B4', ''], - ['Endergreen12', 'none', 'Custom Gameplay Changers', 'https://github.com/Endergreen12', '00C834', ''], + ['NexIsDumb', 'neo', 'Custom Options\n"Who the fuck is breathing inside my walls"', 'https://github.com/NexIsDumb', '7D485C', ''], + ['Endergreen12', 'ender', 'Custom Gameplay Changers', 'https://github.com/Endergreen12', '00C834', ''], ['Verwex', 'verwex', 'Micd Up Paths System\n"hell"', 'https://github.com/Verwex', '8FFFFF', ''], - ['ActualMandM', 'none', 'RGB Note Coloring System', 'https://linktr.ee/ActualMandM', '9C5D88', ''], + ['ActualMandM', 'mandm', 'RGB Note Coloring System', 'https://linktr.ee/ActualMandM', '9C5D88', ''], ['You', 'face', 'For playing :)', 'https://joalor64.itch.io/', '7E00FF', 'stolethisfromGamerEnginelol'], [''], ['Psych Engine Team'], @@ -82,6 +81,8 @@ class CreditsState extends MusicBeatState ['Engine Contributors'], ['iFlicky', 'flicky', 'Composer of Psync and Tea Time\nMade the Dialogue Sounds', 'https://twitter.com/flicky_i', '9E29CF', ''], ['gedehari', 'sqirra', 'Crash Handler and Base code for\nChart Editor\'s Waveform', 'https://twitter.com/gedehari', 'E1843A', ''], + ['crowplexus', 'crowplexus', 'Customizable Main Menu with .JSON, Old Latin Support\nCredits Sounds\n"just happy to be here!"', 'https://github.com/crowplexus', 'a1a1a1', 'Ghost'], + ['TahirKarabekiroglu', 'tahir', 'SScript\nFunkin Cocoa Code\nSoftcoded Achievements, Replay System', 'https://github.com/TahirKarabekiroglu', 'A04397', ''], ['EliteMasterEric', 'mastereric', 'Runtime Shaders support', 'https://twitter.com/EliteMasterEric', 'FFBD40', ''], ['PolybiusProxy', 'proxy', 'Creator of hxCodec', 'https://twitter.com/polybiusproxy', 'DCD294', ''], ['KadeDev', 'kade', 'Fixed Chart Editor and other PRs\nExtension WebM Fork', 'https://twitter.com/kade0912', '64A250', ''], diff --git a/source/meta/video/CutsceneHandler.hx b/source/meta/video/CutsceneHandler.hx index 83f35dac..f12782f8 100644 --- a/source/meta/video/CutsceneHandler.hx +++ b/source/meta/video/CutsceneHandler.hx @@ -1,10 +1,6 @@ package meta.video; import flixel.graphics.atlas.FlxAtlas; -import flixel.graphics.frames.FlxAtlasFrames; -import flixel.sound.FlxSound; - -import animateatlas.AtlasFrameMaker; class CutsceneHandler extends FlxBasic { diff --git a/source/meta/video/VideoState.hx b/source/meta/video/VideoState.hx index 8c9d32f9..76f0f9bd 100644 --- a/source/meta/video/VideoState.hx +++ b/source/meta/video/VideoState.hx @@ -1,5 +1,6 @@ package meta.video; +// CAN BE USED ANYWHERE class VideoState extends MusicBeatState { var leSource:String = ""; diff --git a/source/meta/video/VideoSubState.hx b/source/meta/video/VideoSubState.hx index 501ba734..f5d7be3c 100644 --- a/source/meta/video/VideoSubState.hx +++ b/source/meta/video/VideoSubState.hx @@ -1,5 +1,6 @@ package meta.video; +// SHOULD ONLY BE USED IN PLAYSTATE class VideoSubState extends MusicBeatSubstate { var leSource:String = ""; diff --git a/source/minigames/KillBF.hx b/source/minigames/KillBF.hx index 0f49ff70..687afc54 100644 --- a/source/minigames/KillBF.hx +++ b/source/minigames/KillBF.hx @@ -20,7 +20,7 @@ class KillBF extends MusicBeatState bg.screenCenter(); add(bg); - scoreText = new FlxText(0, (FlxG.height * 0.89) + 36, FlxG.height, 'Score: ${score} // Misses: ${misses}', 20); + scoreText = new FlxText(0, (FlxG.height * 0.89) + 36, FlxG.height, 'Score: $score // Misses: $misses', 20); scoreText.setFormat(Paths.font('vcr.ttf'), 48, FlxColor.WHITE, FlxTextAlign.CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); scoreText.screenCenter(X); add(scoreText); @@ -71,6 +71,7 @@ class KillBF extends MusicBeatState { var sprite:FallingIcon = new FallingIcon(FlxG.random.int(0, FlxG.width - 20), -100); sprite.velocity.y = FlxG.random.int(80, 160); + sprite.flipX = FlxG.random.bool(50); beef.push(sprite); add(sprite); }