From 1b0ad7d3a6c90203d76185469151f5f1cecfc396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=8D=9A=7ENex?= <87421482+NexIsDumb@users.noreply.github.com> Date: Sun, 6 Jul 2025 04:44:46 +0200 Subject: [PATCH] some more stuff SOMEONE HAVE TO TEST THESE 2 COMM --- assets/data/weeks/characters/spooky.xml | 2 +- source/funkin/backend/chart/VSliceParser.hx | 3 +- .../events/splash/SplashShowEvent.hx | 3 +- source/funkin/backend/system/Flags.hx | 19 +++---- source/funkin/backend/week/Week.hx | 12 +++- source/funkin/backend/week/WeekData.hx | 2 + source/funkin/menus/BetaWarningState.hx | 57 ------------------- source/funkin/menus/StoryMenuState.hx | 2 - 8 files changed, 23 insertions(+), 77 deletions(-) delete mode 100644 source/funkin/menus/BetaWarningState.hx diff --git a/assets/data/weeks/characters/spooky.xml b/assets/data/weeks/characters/spooky.xml index e4955b1f..3b32cd36 100644 --- a/assets/data/weeks/characters/spooky.xml +++ b/assets/data/weeks/characters/spooky.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/source/funkin/backend/chart/VSliceParser.hx b/source/funkin/backend/chart/VSliceParser.hx index 606054a2..b58ab9c7 100644 --- a/source/funkin/backend/chart/VSliceParser.hx +++ b/source/funkin/backend/chart/VSliceParser.hx @@ -183,8 +183,7 @@ class VSliceParser { result.stepsPerBeat = firstTimeChange.d.getDefault(Flags.DEFAULT_STEPS_PER_BEAT); result.displayName = songName; result.icon = Flags.DEFAULT_HEALTH_ICON; - result.color = "#FFFFFF"; - //result.parsedColor = 0xFFFFFF; + result.color = 0xFFFFFF; result.opponentModeAllowed = true; result.coopAllowed = true; result.difficulties = data.playData.difficulties.concat(data.playData.songVariations.getDefault([])); diff --git a/source/funkin/backend/scripting/events/splash/SplashShowEvent.hx b/source/funkin/backend/scripting/events/splash/SplashShowEvent.hx index 6cdea0ee..1973f3c2 100644 --- a/source/funkin/backend/scripting/events/splash/SplashShowEvent.hx +++ b/source/funkin/backend/scripting/events/splash/SplashShowEvent.hx @@ -1,5 +1,6 @@ package funkin.backend.scripting.events.splash; +import funkin.game.Splash; import funkin.game.SplashGroup; import funkin.game.Strum; @@ -11,7 +12,7 @@ final class SplashShowEvent extends CancellableEvent { /** Splash that is shown **/ - public var splash:FunkinSprite; + public var splash:Splash; /** Strum that the splash is shown on **/ diff --git a/source/funkin/backend/system/Flags.hx b/source/funkin/backend/system/Flags.hx index 719e90fc..eace974c 100644 --- a/source/funkin/backend/system/Flags.hx +++ b/source/funkin/backend/system/Flags.hx @@ -1,13 +1,12 @@ package funkin.backend.system; -import lime.utils.AssetLibrary as LimeAssetLibrary; -import lime.utils.AssetType; import flixel.util.FlxColor; - -import lime.app.Application; -import funkin.backend.system.macros.GitCommitMacro; import funkin.backend.assets.IModsAssetLibrary; import funkin.backend.assets.ScriptedAssetLibrary; +import funkin.backend.system.macros.GitCommitMacro; +import lime.app.Application; +import lime.utils.AssetLibrary as LimeAssetLibrary; +import lime.utils.AssetType; /** * A class that reads the `flags.ini` file, allowing to read settable Flags (customs too). @@ -28,10 +27,6 @@ class Flags { public static var REPO_OWNER:String = "CodenameCrew"; public static var REPO_URL:String = 'https://github.com/$REPO_OWNER/$REPO_NAME'; - // make this empty once you guys are done with the project. - // good luck /gen <3 @crowplexus - public static var RELEASE_CYCLE:String = "Beta"; - /** * Preferred sound extension for the game's audio files. * Currently is set to `mp3` for web targets, and `ogg` for other targets. @@ -41,7 +36,7 @@ class Flags { public static var IMAGE_EXT:String = "png"; // we also support jpg public static var DEFAULT_DISCORD_LOGO_KEY:String = "icon"; - public static var DEFAULT_DISCORD_CLIENT_ID:String = "1027994136193810442"; + public static var DEFAULT_DISCORD_CLIENT_ID:String = "1383853614589673472"; public static var DEFAULT_DISCORD_LOGO_TEXT:String = "Codename Engine"; @:also(funkin.game.Character.FALLBACK_CHARACTER) @@ -61,6 +56,7 @@ class Flags { public static var DEFAULT_BPM:Float = 100.0; public static var DEFAULT_BEATS_PER_MEASURE:Int = 4; public static var DEFAULT_STEPS_PER_BEAT:Int = 4; + public static var DEFAULT_LOOP_TIME:Float = 0.0; public static var SUPPORTED_CHART_RUNTIME_FORMATS:Array = ["Legacy", "Psych Engine"]; public static var SUPPORTED_CHART_FORMATS:Array = ["BaseGame"]; @@ -73,9 +69,10 @@ class Flags { public static var VSLICE_DEFAULT_PREVIEW_END:Int = 15000; /** - * Default background colors for songs without bg color + * Default background colors for songs or more without bg color */ public static var DEFAULT_COLOR:FlxColor = 0xFF9271FD; + public static var DEFAULT_WEEK_COLOR:FlxColor = 0xFFF9CF51; public static var DEFAULT_COOP_ALLOWED:Bool = false; public static var DEFAULT_OPPONENT_MODE_ALLOWED:Bool = false; diff --git a/source/funkin/backend/week/Week.hx b/source/funkin/backend/week/Week.hx index 17c58cd0..d9f36922 100644 --- a/source/funkin/backend/week/Week.hx +++ b/source/funkin/backend/week/Week.hx @@ -1,6 +1,7 @@ package funkin.backend.week; import flixel.math.FlxPoint; +import flixel.util.FlxColor; import funkin.backend.week.WeekData.WeekCharacter; import funkin.backend.week.WeekData; import haxe.xml.Access; @@ -24,7 +25,8 @@ class Week { sprite: week.getAtt('sprite').getDefault(weekName), chars: [null, null, null], songs: [], - difficulties: ['easy', 'normal', 'hard'] + difficulties: ['easy', 'normal', 'hard'], + bgColor: week.has.bgColor ? FlxColor.fromString(week.getAtt("bgColor")) : Flags.DEFAULT_WEEK_COLOR }; var weekName = weekObj.name; @@ -72,10 +74,14 @@ class Week { catch(e) Logs.trace('Cannot parse character "$charName.xml": ${Std.string(e)}', ERROR); if (char == null) return null; + if (!char.has.name) char.x.set("name", charName); + if (!char.has.sprite) char.x.set("sprite", 'menus/storymenu/characters/${char.att.name}'); + if (!char.has.updateHitbox) char.x.set("updateHitbox", "true"); + return { xml: char, - name: charName, - spritePath: Paths.image(char.getAtt('sprite').getDefault('menus/storymenu/characters/${charName}')), + name: char.att.name, + spritePath: char.att.sprite, scale: Std.parseFloat(char.getAtt('scale')).getDefault(1), offset: FlxPoint.get( Std.parseFloat(char.getAtt('x')).getDefault(0), diff --git a/source/funkin/backend/week/WeekData.hx b/source/funkin/backend/week/WeekData.hx index 8f51872a..7be40175 100644 --- a/source/funkin/backend/week/WeekData.hx +++ b/source/funkin/backend/week/WeekData.hx @@ -1,6 +1,7 @@ package funkin.backend.week; import flixel.math.FlxPoint; +import flixel.util.FlxColor; import haxe.xml.Access; typedef WeekData = { @@ -11,6 +12,7 @@ typedef WeekData = { var chars:Array; var songs:Array; var difficulties:Array; + var bgColor:FlxColor; } typedef WeekCharacter = { diff --git a/source/funkin/menus/BetaWarningState.hx b/source/funkin/menus/BetaWarningState.hx deleted file mode 100644 index 30e3c4fd..00000000 --- a/source/funkin/menus/BetaWarningState.hx +++ /dev/null @@ -1,57 +0,0 @@ -package funkin.menus; - -import flixel.text.FlxText; -import flixel.util.FlxColor; -import funkin.backend.FunkinText; - -class BetaWarningState extends MusicBeatState { - var titleAlphabet:Alphabet; - var disclaimer:FunkinText; - - var transitioning:Bool = false; - - public override function create() { - super.create(); - - titleAlphabet = new Alphabet(0, 0, "WARNING", true); - titleAlphabet.screenCenter(X); - add(titleAlphabet); - - disclaimer = new FunkinText(16, titleAlphabet.y + titleAlphabet.height + 10, FlxG.width - 32, "", 32); - disclaimer.alignment = CENTER; - disclaimer.applyMarkup('This engine is still in a *${Flags.RELEASE_CYCLE}* state. That means *majority of the features* are either *buggy* or *non finished*. If you find any bugs, please report them to the Codename Engine GitHub.\n\nPress ENTER to continue', - [ - new FlxTextFormatMarkerPair(new FlxTextFormat(0xFFFF4444), "*") - ] - ); - add(disclaimer); - - var off = Std.int((FlxG.height - (disclaimer.y + disclaimer.height)) / 2); - disclaimer.y += off; - titleAlphabet.y += off; - - DiscordUtil.call("onMenuLoaded", ["Beta Warning"]); - } - - public override function update(elapsed:Float) { - super.update(elapsed); - - if (controls.ACCEPT && transitioning) { - FlxG.camera.stopFX(); FlxG.camera.visible = false; - goToTitle(); - } - - if (controls.ACCEPT && !transitioning) { - transitioning = true; - CoolUtil.playMenuSFX(CONFIRM); - FlxG.camera.flash(FlxColor.WHITE, 1, function() { - FlxG.camera.fade(FlxColor.BLACK, 2.5, false, goToTitle); - }); - } - } - - private function goToTitle() { - MusicBeatState.skipTransIn = MusicBeatState.skipTransOut = true; - FlxG.switchState(new TitleState()); - } -} \ No newline at end of file diff --git a/source/funkin/menus/StoryMenuState.hx b/source/funkin/menus/StoryMenuState.hx index 817b9aa1..ede7a714 100644 --- a/source/funkin/menus/StoryMenuState.hx +++ b/source/funkin/menus/StoryMenuState.hx @@ -198,7 +198,6 @@ class StoryMenuState extends MusicBeatState { if (char == null || (newChar = characters[char.name]) == null) modifyCharacterAt(i); else if ((curChar = cast characterSprites.members[i]) == null || newChar.name != curChar.name) modifyCharacterAt(i, newChar); // forcing the sprites to be FunkinSprite basically - Nex - trace(newChar != null ? newChar.name : null, curChar != null ? curChar.name : null); } changeDifficulty(0, true); @@ -260,7 +259,6 @@ class StoryMenuState extends MusicBeatState { old.destroy(); } - trace(data); if (data != null) { curChar = XMLUtil.createSpriteFromXML(data.xml, "", BEAT); curChar.offset.x += curChar.x; curChar.offset.y += curChar.y;