From f306e603bed47608deb3742a89d15ae950d95365 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Mon, 1 Feb 2021 05:52:10 -0500 Subject: [PATCH] aligned pixel arrows --- source/DialogueBox.hx | 5 +++++ source/Note.hx | 3 +++ source/PlayState.hx | 10 +++++----- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/source/DialogueBox.hx b/source/DialogueBox.hx index 9be4fd482..e8681e72e 100644 --- a/source/DialogueBox.hx +++ b/source/DialogueBox.hx @@ -30,6 +30,8 @@ class DialogueBox extends FlxSpriteGroup var portraitLeft:FlxSprite; var portraitRight:FlxSprite; + var handSelect:FlxSprite; + public function new(talkingRight:Bool = true, ?dialogueList:Array) { super(); @@ -73,6 +75,9 @@ class DialogueBox extends FlxSpriteGroup box.updateHitbox(); add(box); + handSelect = new FlxSprite(FlxG.width * 0.9, FlxG.height * 0.9).loadGraphic('assets/images/weeb/pixelUI/hand_textbox.png'); + add(handSelect); + box.screenCenter(X); portraitLeft.screenCenter(X); diff --git a/source/Note.hx b/source/Note.hx index ca57a64f2..cad64c1c0 100644 --- a/source/Note.hx +++ b/source/Note.hx @@ -139,6 +139,9 @@ class Note extends FlxSprite x -= width / 2; + if (PlayState.curStage == 'school') + x += 30; + if (prevNote.isSustainNote) { switch (prevNote.noteData) diff --git a/source/PlayState.hx b/source/PlayState.hx index 8eb75aa4e..d260ff2c4 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -149,11 +149,9 @@ class PlayState extends MusicBeatState "Only then I will even CONSIDER letting you\ndate my daughter!" ]; case 'senpai': - dialogue = [ - ':dad:Ah, a new fair maiden has come in search of true love!', - ":dad:A serenade between gentlemen shall decide where her beautiful heart shall reside.", - ":bf:Beep bo bop" - ]; + dialogue = CoolUtil.coolTextFile('assets/data/senpai/senpaiDialogue.txt'); + case 'roses': + dialogue = CoolUtil.coolTextFile('assets/data/roses/rosesDialogue.txt'); } if (SONG.song.toLowerCase() == 'spookeez' || SONG.song.toLowerCase() == 'monster' || SONG.song.toLowerCase() == 'south') @@ -638,6 +636,8 @@ class PlayState extends MusicBeatState { case 'senpai': schoolIntro(doof); + case 'roses': + schoolIntro(doof); default: startCountdown(); }