Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-30 03:25:47 -05:00
Code Issues Projects Releases Packages Wiki Activity

aligned pixel arrows

Browse source
This commit is contained in:
Cameron Taylor 2021-02-01 05:52:10 -05:00
parent 13ae7d65b6
commit f306e603be
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/DialogueBox.hx
View file

@ -30,6 +30,8 @@ class DialogueBox extends FlxSpriteGroup
var portraitLeft:FlxSprite; var portraitLeft:FlxSprite;
var portraitRight:FlxSprite; var portraitRight:FlxSprite;
var handSelect:FlxSprite;
public function new(talkingRight:Bool = true, ?dialogueList:Array<String>) public function new(talkingRight:Bool = true, ?dialogueList:Array<String>)
{ {
super(); super();
@ -73,6 +75,9 @@ class DialogueBox extends FlxSpriteGroup
box.updateHitbox(); box.updateHitbox();
add(box); 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); box.screenCenter(X);
portraitLeft.screenCenter(X); portraitLeft.screenCenter(X);

3
source/Note.hx
View file

@ -139,6 +139,9 @@ class Note extends FlxSprite
x -= width / 2; x -= width / 2;
if (PlayState.curStage == 'school')
x += 30;
if (prevNote.isSustainNote) if (prevNote.isSustainNote)
{ {
switch (prevNote.noteData) switch (prevNote.noteData)

10
source/PlayState.hx
View file

@ -149,11 +149,9 @@ class PlayState extends MusicBeatState
"Only then I will even CONSIDER letting you\ndate my daughter!" "Only then I will even CONSIDER letting you\ndate my daughter!"
]; ];
case 'senpai': case 'senpai':
dialogue = [ dialogue = CoolUtil.coolTextFile('assets/data/senpai/senpaiDialogue.txt');
':dad:Ah, a new fair maiden has come in search of true love!', case 'roses':
":dad:A serenade between gentlemen shall decide where her beautiful heart shall reside.", dialogue = CoolUtil.coolTextFile('assets/data/roses/rosesDialogue.txt');
":bf:Beep bo bop"
];
} }
if (SONG.song.toLowerCase() == 'spookeez' || SONG.song.toLowerCase() == 'monster' || SONG.song.toLowerCase() == 'south') if (SONG.song.toLowerCase() == 'spookeez' || SONG.song.toLowerCase() == 'monster' || SONG.song.toLowerCase() == 'south')
@ -638,6 +636,8 @@ class PlayState extends MusicBeatState
{ {
case 'senpai': case 'senpai':
schoolIntro(doof); schoolIntro(doof);
case 'roses':
schoolIntro(doof);
default: default:
startCountdown(); startCountdown();
} }