Skip to content

Commit

Permalink
replaced Base Engine's icon art and stuff with original assets
Browse files Browse the repository at this point in the history
  • Loading branch information
DEMOLITIONDON96 committed Mar 26, 2024
1 parent eef3678 commit 4916a05
Show file tree
Hide file tree
Showing 28 changed files with 43 additions and 22 deletions.
2 changes: 1 addition & 1 deletion Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<source path="source" />
<assets path="assets" />

<assets path="FEF-CrashDialog.exe" type="template" if="windows release" />
<assets path="SE-CrashHandler.exe" type="template" if="windows release" />
<assets path="FEF-CrashDialog" type="template" if="linux release" />

<!-- _______________________________ Libraries ______________________________ -->
Expand Down
Binary file renamed FEF-CrashDialog.exe → SE-CrashHandler.exe
Binary file not shown.
Binary file modified art/icon128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified art/icon16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified art/icon256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified art/icon32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified art/icon512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified art/icon64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified art/iconOG.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions crash-dialog/application.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<project>
<meta title="Feather Crash Dialog" package="com.gedehari.haxecrashlog" version="1.0.0" company="" />
<app main="Main" file="FEF-CrashDialog" path="export" />
<meta title="Spectra Crash Handler" package="com.gedehari.haxecrashlog" version="1.0.0" company="" />
<app main="Main" file="SE-CrashHandler" path="export" />

<window background="#FFFFFF" fps="60" resizable="false" />
<window width="500" height="440" if="desktop" />
Expand All @@ -12,6 +12,10 @@
<haxelib name="openfl" />
<haxelib name="actuate" />

<haxelib name="flixel" />
<haxelib name="flixel-addons" />
<haxelib name="flixel-ui" />

<haxelib name="haxeui-core" />
<haxelib name="haxeui-openfl" />

Expand Down
Binary file removed crash-dialog/assets/banner.png
Binary file not shown.
Binary file added crash-dialog/assets/banners/banner-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added crash-dialog/assets/banners/banner-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crash-dialog/assets/icons/icon128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crash-dialog/assets/icons/icon16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crash-dialog/assets/icons/icon256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crash-dialog/assets/icons/icon32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crash-dialog/assets/icons/icon512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crash-dialog/assets/icons/icon64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crash-dialog/assets/icons/iconOG.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<vbox width="500">
<!-- <box width="500" height="100" style="background-color: red; border:1px solid red; background-opacity: .5" /> -->
<image resource="assets/banner.png" />
<image resource="assets/banners/banner-1.png" />
<vbox style="padding: 5px;" width="100%">
<label id="message-label" text="Message" width="100%" textAlign="center" />
<label text="Call stack:" />
Expand Down
19 changes: 19 additions & 0 deletions crash-dialog/assets/mainViews/main-view-2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<vbox width="500">
<!-- <box width="500" height="100" style="background-color: red; border:1px solid red; background-opacity: .5" /> -->
<image resource="assets/banners/banner-2.png" />
<vbox style="padding: 5px;" width="100%">
<label id="message-label" text="Message" width="100%" textAlign="center" />
<label text="Call stack:" />
<scrollview width="100%" height="200" contentWidth="100%">
<vbox style="padding: 2px;" width="100%">
<label text="Call Stack" id="call-stack-label" />
</vbox>
</scrollview>
<label text="Crash Reason" id="crash-reason-label" />
<box width="100%">
<button horizontalAlign="left" id="view-crash-dump-button" text="View Crash Dump" />
<button horizontalAlign="center" id="restart-button" text="Restart" />
<button horizontalAlign="right" id="close-button" text="Close" />
</box>
</vbox>
</vbox>
13 changes: 8 additions & 5 deletions crash-dialog/src/Main.hx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import haxe.ui.HaxeUIApp;
import haxe.ui.components.Button;
import haxe.ui.components.Label;
import haxe.ui.core.Component;
import haxe.ui.macros.ComponentMacros;
import haxe.ui.ComponentBuilder;
import flixel.FlxG;
import sys.io.File;
import sys.io.Process;

Expand Down Expand Up @@ -39,16 +40,18 @@ class Main
var path:String = args[0];
var contents:String = File.getContent(path);
var split:Array<String> = contents.split("\n");
var mainView:Component;
var numba:Int = FlxG.random.int(1, 2);

var app = new HaxeUIApp();

app.ready(function()
{
var mainView:Component = ComponentMacros.buildComponent("assets/main-view.xml");
mainView = numba == 1 ? ComponentBuilder.fromFile("assets/mainViews/main-view-1.xml") : ComponentBuilder.fromFile("assets/mainViews/main-view-2.xml");
app.addComponent(mainView);

var messageLabel:Label = mainView.findComponent("message-label", Label);
messageLabel.text = quotes[Std.random(quotes.length)] + "\nUnfortunately, Forever Engine Feather has crashed.";
messageLabel.text = quotes[Std.random(quotes.length)] + "\nOh No! Spectra Engine has crashed.";
messageLabel.percentWidth = 100;
messageLabel.textAlign = "center";

Expand Down Expand Up @@ -84,9 +87,9 @@ class Main
mainView.findComponent("restart-button", Button).onClick = function(_)
{
#if windows
new Process("FE-Feather.exe", []); // How did the original devs of this engine overlook something simple????
new Process("Spectra Engine.exe", []);
#elseif linux
new Process("./FE-Feather", []);
new Process("./Spectra Engine", []);
#end

Sys.exit(0);
Expand Down
8 changes: 4 additions & 4 deletions source/globals/Main.hx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class Main extends Sprite
framerate: 60, // the game's default framerate
skipSplash: true, // whether to skip the flixel splash screen that appears on release mode
fullscreen: false, // whether the game starts at fullscreen mode
version: "0.1", // version of the engine
version: "0.2.1", // version of the engine
};

public static var baseGame:FNFGame;
Expand Down Expand Up @@ -399,7 +399,7 @@ class Main extends Sprite
dateNow = StringTools.replace(dateNow, " ", "_");
dateNow = StringTools.replace(dateNow, ":", "'");

path = "crash/" + "Feather_" + dateNow + ".txt";
path = "crash/" + "Spectra_" + dateNow + ".txt";

for (stackItem in callStack)
{
Expand All @@ -413,7 +413,7 @@ class Main extends Sprite
}
}

errMsg += "\nUncaught Error: " + e.error + " - Please report this error to the\nGitHub page https://github.com/BeastlyGhost/Forever-Engine-Feather";
errMsg += "\nUncaught Error: " + e.error + " - Please report this error to the\nGitHub page https://github.com/DEMOLITIONDON96/Spectra-Engine";

if (!FileSystem.exists("crash/"))
FileSystem.createDirectory("crash/");
Expand All @@ -423,7 +423,7 @@ class Main extends Sprite
Sys.println(errMsgPrint);
Sys.println("Crash dump saved in " + Path.normalize(path));

var crashDialoguePath:String = "FEF-CrashDialog";
var crashDialoguePath:String = "SE-CrashHandler";

#if windows
crashDialoguePath += ".exe";
Expand Down
2 changes: 1 addition & 1 deletion source/objects/ui/hud/toggleable/ClassHUD.hx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class ClassHUD extends FlxSpriteGroup
// display texts
public var infoDisplay:String = CoolUtil.dashToSpace(PlayState.SONG.song);
public var diffDisplay:String = '[${CoolUtil.difficultyString}]';
public var engineDisplay:String = 'Spectra Engine v0.2.0';
public var engineDisplay:String = 'Spectra Engine v' + Main.game.version;

// eep
public function new()
Expand Down
2 changes: 1 addition & 1 deletion source/objects/ui/hud/toggleable/KadeHUD.hx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class KadeHUD extends FlxSpriteGroup
// display texts
public var infoDisplay:String = "";
public var diffDisplay:String = "";
public var engineDisplay:String = 'Spectra Engine v0.2.0';
public var engineDisplay:String = 'Spectra Engine v' + Main.game.version;

public var timeTxt:FlxText;
public var timeBar:FlxBar;
Expand Down
2 changes: 1 addition & 1 deletion source/objects/ui/hud/toggleable/PsychHUD.hx
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class PsychHUD extends FlxSpriteGroup

if(Init.trueSettings.get('Downscroll')) timeTxt.y = FlxG.height - 44;

timeBarBG = new AttachedSprite('UI/funkinAVI/timeBar');
timeBarBG = new AttachedSprite('UI/default/base/timeBar');
timeBarBG.x = timeTxt.x;
timeBarBG.y = timeTxt.y + (timeTxt.height / 4);
timeBarBG.scrollFactor.set();
Expand Down
7 changes: 1 addition & 6 deletions source/objects/ui/hud/toggleable/SpectraHUD.hx
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ class SpectraHUD extends FlxSpriteGroup
public var songTime:FlxText;
public var healthBarBG:FlxSprite;
public var healthBar:FlxBar;
public var timeBarBG:FlxSprite;
public var timeBar:FlxBar;
public var songPercent:Float = 0;

// mark variables
Expand Down Expand Up @@ -72,7 +70,7 @@ class SpectraHUD extends FlxSpriteGroup
// display texts
public var infoDisplay:String = CoolUtil.dashToSpace(PlayState.SONG.song);
public var diffDisplay:String = '[${CoolUtil.difficultyString}]';
public var engineDisplay:String = "Spectra Engine v0.2.0";
public var engineDisplay:String = "Spectra Engine v" + Main.game.version;

// eep
public function new()
Expand All @@ -85,9 +83,6 @@ class SpectraHUD extends FlxSpriteGroup
if (!Init.trueSettings.get('Centered Notefield')) songTime.screenCenter(X);
songTime.scrollFactor.set();
songTime.borderSize = 2;

/*add(timeBarBG);
add(timeBar);*/
add(songTime);

// le healthbar setup
Expand Down

0 comments on commit 4916a05

Please sign in to comment.