diff --git a/assets/data/roses/rosesDialogue.txt b/assets/data/roses/rosesDialogue.txt new file mode 100644 index 0000000..63a60f8 --- /dev/null +++ b/assets/data/roses/rosesDialogue.txt @@ -0,0 +1,3 @@ +:dad:Not bad for an ugly worm. +:dad:But this time I'll rip your nuts off right after your girlfriend finishes gargling mine. +:bf:Bop beep be be skdoo bep \ No newline at end of file diff --git a/assets/data/senpai/senpaiDialogue.txt b/assets/data/senpai/senpaiDialogue.txt new file mode 100644 index 0000000..af03e37 --- /dev/null +++ b/assets/data/senpai/senpaiDialogue.txt @@ -0,0 +1,3 @@ +: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 \ No newline at end of file diff --git a/assets/images/weeb/pixelUI/hand_textbox.png b/assets/images/weeb/pixelUI/hand_textbox.png new file mode 100644 index 0000000..8d472ae Binary files /dev/null and b/assets/images/weeb/pixelUI/hand_textbox.png differ diff --git a/source/DialogueBox.hx b/source/DialogueBox.hx index 9be4fd4..e8681e7 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 ca57a64..cad64c1 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 8eb75aa..d260ff2 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(); }