gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

some more stuff SOMEONE HAVE TO TEST THESE 2 COMM

Browse Source
This commit is contained in:
⍚~Nex
2025-07-06 04:44:46 +02:00
parent 066dc7d57a
commit 1b0ad7d3a6
8 changed files with 23 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/data/weeks/characters/spooky.xml
+1 -1
View File
@@ -1,2 +1,2 @@
<!DOCTYPE codename-engine-week-character>
<char scale="0.5" x="80" y="-50"/>
<char scale="0.5" x="80" y="-50" beatInterval="1"/>
source/funkin/backend/chart/VSliceParser.hx
+1 -2
View File
@@ -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([]));
source/funkin/backend/scripting/events/splash/SplashShowEvent.hx
+2 -1
View File
@@ -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
**/
source/funkin/backend/system/Flags.hx
+8 -11
View File
@@ -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<String> = ["Legacy", "Psych Engine"];
public static var SUPPORTED_CHART_FORMATS:Array<String> = ["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;
source/funkin/backend/week/Week.hx
+9 -3
View File
@@ -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),
source/funkin/backend/week/WeekData.hx
+2
View File
@@ -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<WeekCharacter>;
var songs:Array<WeekSong>;
var difficulties:Array<String>;
var bgColor:FlxColor;
}
typedef WeekCharacter = {
source/funkin/menus/BetaWarningState.hx
-57
View File
@@ -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());
}
}
source/funkin/menus/StoryMenuState.hx
-2
View File
@@ -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;