diff --git a/Project.xml b/Project.xml
index ef9f93f0..f39c8b8d 100644
--- a/Project.xml
+++ b/Project.xml
@@ -7,6 +7,9 @@
+
+
+
@@ -147,6 +150,8 @@
-
-
+
+
+
+
diff --git a/assets/data/config.xml b/assets/data/config.xml
new file mode 100644
index 00000000..ea264b4c
--- /dev/null
+++ b/assets/data/config.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/assets/data/introText.txt b/assets/data/titlescreen/introText.txt
similarity index 79%
rename from assets/data/introText.txt
rename to assets/data/titlescreen/introText.txt
index 44f02b3a..d2c900a1 100644
--- a/assets/data/introText.txt
+++ b/assets/data/titlescreen/introText.txt
@@ -40,3 +40,17 @@ updates each friday--on time every time
shoutouts to mason--for da homies
bonk--get in the discord call
github exclusive intro text--open source forever
+
+still waiting--for the stage editor
+its millions--to one
+make mods--not malware
+yoshi engine--never heard of it
+cant add ndlls--its a haxe feature
+xml is--too powerful
+its only been--a week
+his name is evilsk8er--dumb alphabet
+you should play--soulles dx demo
+do you yield--i do not
+funk funk--revolution
+null object--reference
+hi--how are you
diff --git a/assets/data/titlescreen/titlescreen.xml b/assets/data/titlescreen/titlescreen.xml
new file mode 100644
index 00000000..7ffecdb1
--- /dev/null
+++ b/assets/data/titlescreen/titlescreen.xml
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/assets/images/gfDanceTitle.png b/assets/images/titlescreen/gfDanceTitle.png
similarity index 100%
rename from assets/images/gfDanceTitle.png
rename to assets/images/titlescreen/gfDanceTitle.png
diff --git a/assets/images/gfDanceTitle.xml b/assets/images/titlescreen/gfDanceTitle.xml
similarity index 100%
rename from assets/images/gfDanceTitle.xml
rename to assets/images/titlescreen/gfDanceTitle.xml
diff --git a/assets/images/logoBumpin.png b/assets/images/titlescreen/logoBumpin.png
similarity index 100%
rename from assets/images/logoBumpin.png
rename to assets/images/titlescreen/logoBumpin.png
diff --git a/assets/images/logoBumpin.xml b/assets/images/titlescreen/logoBumpin.xml
similarity index 100%
rename from assets/images/logoBumpin.xml
rename to assets/images/titlescreen/logoBumpin.xml
diff --git a/assets/images/titleEnter.png b/assets/images/titlescreen/titleEnter.png
similarity index 100%
rename from assets/images/titleEnter.png
rename to assets/images/titlescreen/titleEnter.png
diff --git a/assets/images/titleEnter.xml b/assets/images/titlescreen/titleEnter.xml
similarity index 100%
rename from assets/images/titleEnter.xml
rename to assets/images/titlescreen/titleEnter.xml
diff --git a/buildnumber.txt b/buildnumber.txt
index 755ab3c2..5f5c3898 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-495
\ No newline at end of file
+496
\ No newline at end of file
diff --git a/source/funkin/menus/TitleState.hx b/source/funkin/menus/TitleState.hx
index 0aceaa8e..f5f64161 100644
--- a/source/funkin/menus/TitleState.hx
+++ b/source/funkin/menus/TitleState.hx
@@ -35,8 +35,6 @@ class TitleState extends MusicBeatState
static var initialized:Bool = false;
var blackScreen:FlxSprite;
- var credGroup:FlxGroup;
- var credTextShit:Alphabet;
var textGroup:FlxGroup;
var ngSpr:FlxSprite;
@@ -106,27 +104,10 @@ class TitleState extends MusicBeatState
titleText.updateHitbox();
add(titleText);
- var logo:FlxSprite = new FlxSprite().loadGraphic(Paths.image('logo'));
- logo.screenCenter();
- logo.antialiasing = true;
- // add(logo);
-
- // FlxTween.tween(logoBl, {y: logoBl.y + 50}, 0.6, {ease: FlxEase.quadInOut, type: PINGPONG});
- // FlxTween.tween(logo, {y: logoBl.y + 50}, 0.6, {ease: FlxEase.quadInOut, type: PINGPONG, startDelay: 0.1});
-
- credGroup = new FlxGroup();
- add(credGroup);
textGroup = new FlxGroup();
blackScreen = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK);
- credGroup.add(blackScreen);
-
- credTextShit = new Alphabet(0, 0, "ninjamuffin99\nPhantomArcade\nkawaisprite\nevilsk8er", true);
- credTextShit.screenCenter();
-
- // credTextShit.alignment = CENTER;
-
- credTextShit.visible = false;
+ add(blackScreen);
ngSpr = new FlxSprite(0, FlxG.height * 0.52).loadGraphic(Paths.image('newgrounds_logo'));
add(ngSpr);
@@ -136,21 +117,17 @@ class TitleState extends MusicBeatState
ngSpr.screenCenter(X);
ngSpr.antialiasing = true;
- FlxTween.tween(credTextShit, {y: credTextShit.y + 20}, 2.9, {ease: FlxEase.quadInOut, type: PINGPONG});
-
FlxG.mouse.visible = false;
if (initialized)
skipIntro();
else
initialized = true;
-
- // credGroup.add(credTextShit);
}
function getIntroTextShit():Array>
{
- var fullText:String = Assets.getText(Paths.txt('introText'));
+ var fullText:String = Assets.getText(Paths.txt('titlescreen/introText'));
var firstArray:Array = fullText.split('\n');
var swagGoodArray:Array> = [];
@@ -220,32 +197,25 @@ class TitleState extends MusicBeatState
function createCoolText(textArray:Array)
{
- for (i in 0...textArray.length)
+ for (i=>text in textArray)
{
- var money:Alphabet = new Alphabet(0, 0, textArray[i], true, false);
+ if (text == "" || text == null) continue;
+ var money:Alphabet = new Alphabet(0, (i * 60) + 200, text, true, false);
money.screenCenter(X);
- money.y += (i * 60) + 200;
- credGroup.add(money);
textGroup.add(money);
}
}
function addMoreText(text:String)
{
- var coolText:Alphabet = new Alphabet(0, 0, text, true, false);
+ var coolText:Alphabet = new Alphabet(0, (textGroup.length * 60) + 200, text, true, false);
coolText.screenCenter(X);
- coolText.y += (textGroup.length * 60) + 200;
- credGroup.add(coolText);
textGroup.add(coolText);
}
function deleteCoolText()
{
- while (textGroup.members.length > 0)
- {
- credGroup.remove(textGroup.members[0], true);
- textGroup.remove(textGroup.members[0], true);
- }
+ while (textGroup.members.length > 0) textGroup.remove(textGroup.members[0], true);
}
override function beatHit()
@@ -260,8 +230,9 @@ class TitleState extends MusicBeatState
else
gfDance.animation.play('danceLeft');
- FlxG.log.add(curBeat);
+ #if TITLESCREEN_XML
+ #else
switch (curBeat)
{
case 1: createCoolText(['ninjamuffin99', 'phantomArcade', 'kawaisprite', 'evilsk8er']);
@@ -278,6 +249,7 @@ class TitleState extends MusicBeatState
case 15: addMoreText('Funkin');
case 16: skipIntro();
}
+ #end
}
var skippedIntro:Bool = false;
@@ -289,7 +261,8 @@ class TitleState extends MusicBeatState
remove(ngSpr);
FlxG.camera.flash(FlxColor.WHITE, 4);
- remove(credGroup);
+ remove(blackScreen);
+ blackScreen.destroy();
skippedIntro = true;
}
}