mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-09-28 21:19:27 +00:00
IM PISSED IM MAD BUT WE CLOSE
This commit is contained in:
parent
91a3f8e2aa
commit
83b5c2012f
5
assets/data/thorns/thornsDialogue.txt
Normal file
5
assets/data/thorns/thornsDialogue.txt
Normal file
|
@ -0,0 +1,5 @@
|
|||
:dad:Direct contact with real humans, after being trapped in here fro so long...
|
||||
:dad:and HER of all people.
|
||||
:dad:I'll make her father pay for what he's done to me and all the others,,,,
|
||||
:dad:I'll beat you and make you take my place.
|
||||
:dad:You don't mind your bodies being borrowed right? It's only fair...
|
BIN
assets/images/weeb/pixelUI/dialogueBox-evil.png
Normal file
BIN
assets/images/weeb/pixelUI/dialogueBox-evil.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.4 KiB |
17
assets/images/weeb/pixelUI/dialogueBox-evil.xml
Normal file
17
assets/images/weeb/pixelUI/dialogueBox-evil.xml
Normal file
|
@ -0,0 +1,17 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TextureAtlas imagePath="dialogueBox-evil.png">
|
||||
<!-- Created with Adobe Animate version 20.0.0.17400 -->
|
||||
<!-- http://www.adobe.com/products/animate.html -->
|
||||
<SubTexture name="Spirit Textbox spawn instance 10000" x="0" y="0" width="249" height="145"/>
|
||||
<SubTexture name="Spirit Textbox spawn instance 10001" x="0" y="0" width="249" height="145"/>
|
||||
<SubTexture name="Spirit Textbox spawn instance 10002" x="259" y="0" width="249" height="145"/>
|
||||
<SubTexture name="Spirit Textbox spawn instance 10003" x="259" y="0" width="249" height="145"/>
|
||||
<SubTexture name="Spirit Textbox spawn instance 10004" x="0" y="155" width="249" height="145"/>
|
||||
<SubTexture name="Spirit Textbox spawn instance 10005" x="0" y="155" width="249" height="145"/>
|
||||
<SubTexture name="Spirit Textbox spawn instance 10006" x="259" y="155" width="249" height="145"/>
|
||||
<SubTexture name="Spirit Textbox spawn instance 10007" x="259" y="155" width="249" height="145"/>
|
||||
<SubTexture name="Spirit Textbox spawn instance 10008" x="0" y="310" width="249" height="145"/>
|
||||
<SubTexture name="Spirit Textbox spawn instance 10009" x="0" y="310" width="249" height="145"/>
|
||||
<SubTexture name="Spirit Textbox spawn instance 10010" x="259" y="310" width="249" height="145"/>
|
||||
<SubTexture name="Spirit Textbox spawn instance 10011" x="259" y="310" width="249" height="145"/>
|
||||
</TextureAtlas>
|
BIN
assets/images/weeb/pixelUI/dialogueBox-senpaiMad.png
Normal file
BIN
assets/images/weeb/pixelUI/dialogueBox-senpaiMad.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 26 KiB |
13
assets/images/weeb/pixelUI/dialogueBox-senpaiMad.xml
Normal file
13
assets/images/weeb/pixelUI/dialogueBox-senpaiMad.xml
Normal file
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TextureAtlas imagePath="dialogueBox-senpaiMad.png">
|
||||
<!-- Created with Adobe Animate version 20.0.0.17400 -->
|
||||
<!-- http://www.adobe.com/products/animate.html -->
|
||||
<SubTexture name="SENPAI ANGRY IMPACT SPEECH instance 10000" x="0" y="0" width="249" height="144"/>
|
||||
<SubTexture name="SENPAI ANGRY IMPACT SPEECH instance 10001" x="259" y="0" width="249" height="144"/>
|
||||
<SubTexture name="SENPAI ANGRY IMPACT SPEECH instance 10002" x="0" y="154" width="249" height="144"/>
|
||||
<SubTexture name="SENPAI ANGRY IMPACT SPEECH instance 10003" x="259" y="154" width="249" height="144"/>
|
||||
<SubTexture name="SENPAI ANGRY IMPACT SPEECH instance 10004" x="0" y="308" width="249" height="144"/>
|
||||
<SubTexture name="SENPAI ANGRY IMPACT SPEECH instance 10005" x="0" y="308" width="249" height="144"/>
|
||||
<SubTexture name="SENPAI ANGRY IMPACT SPEECH instance 10006" x="259" y="308" width="249" height="144"/>
|
||||
<SubTexture name="SENPAI ANGRY IMPACT SPEECH instance 10007" x="259" y="308" width="249" height="144"/>
|
||||
</TextureAtlas>
|
BIN
assets/images/weeb/spiritFaceForward.png
Normal file
BIN
assets/images/weeb/spiritFaceForward.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2 KiB |
BIN
assets/music/LunchboxScary.mp3
Normal file
BIN
assets/music/LunchboxScary.mp3
Normal file
Binary file not shown.
BIN
assets/music/LunchboxScary.ogg
Normal file
BIN
assets/music/LunchboxScary.ogg
Normal file
Binary file not shown.
BIN
assets/sounds/ANGRY.mp3
Normal file
BIN
assets/sounds/ANGRY.mp3
Normal file
Binary file not shown.
BIN
assets/sounds/ANGRY.ogg
Normal file
BIN
assets/sounds/ANGRY.ogg
Normal file
Binary file not shown.
BIN
assets/sounds/ANGRY_TEXT_BOX.mp3
Normal file
BIN
assets/sounds/ANGRY_TEXT_BOX.mp3
Normal file
Binary file not shown.
BIN
assets/sounds/ANGRY_TEXT_BOX.ogg
Normal file
BIN
assets/sounds/ANGRY_TEXT_BOX.ogg
Normal file
Binary file not shown.
|
@ -7,6 +7,7 @@ import flixel.graphics.frames.FlxAtlasFrames;
|
|||
import flixel.group.FlxSpriteGroup;
|
||||
import flixel.input.FlxKeyManager;
|
||||
import flixel.text.FlxText;
|
||||
import flixel.util.FlxColor;
|
||||
import flixel.util.FlxTimer;
|
||||
|
||||
using StringTools;
|
||||
|
@ -37,8 +38,15 @@ class DialogueBox extends FlxSpriteGroup
|
|||
{
|
||||
super();
|
||||
|
||||
switch (PlayState.SONG.song.toLowerCase())
|
||||
{
|
||||
case 'senpai':
|
||||
FlxG.sound.playMusic('assets/music/Lunchbox' + TitleState.soundExt, 0);
|
||||
FlxG.sound.music.fadeIn(1, 0, 0.8);
|
||||
case 'thorns':
|
||||
FlxG.sound.playMusic('assets/music/LunchboxScary' + TitleState.soundExt, 0);
|
||||
FlxG.sound.music.fadeIn(1, 0, 0.8);
|
||||
}
|
||||
|
||||
bgFade = new FlxSprite(-200, -200).makeGraphic(Std.int(FlxG.width * 1.3), Std.int(FlxG.height * 1.3), 0xFFB3DFd8);
|
||||
bgFade.scrollFactor.set();
|
||||
|
@ -71,9 +79,32 @@ class DialogueBox extends FlxSpriteGroup
|
|||
portraitRight.visible = false;
|
||||
|
||||
box = new FlxSprite(-20, 45);
|
||||
box.frames = FlxAtlasFrames.fromSparrow('assets/images/weeb/pixelUI/dialogueBox-pixel.png', 'assets/images/weeb/pixelUI/dialogueBox-pixel.xml');
|
||||
|
||||
switch (PlayState.SONG.song.toLowerCase())
|
||||
{
|
||||
case 'senpai':
|
||||
box.frames = FlxAtlasFrames.fromSparrow('assets/images/weeb/pixelUI/dialogueBox-pixel.png',
|
||||
'assets/images/weeb/pixelUI/dialogueBox-pixel.xml');
|
||||
box.animation.addByPrefix('normalOpen', 'Text Box Appear', 24, false);
|
||||
box.animation.addByIndices('normal', 'Text Box Appear', [4], "", 24);
|
||||
case 'roses':
|
||||
FlxG.sound.play('assets/sounds/ANGRY_TEXT_BOX' + TitleState.soundExt);
|
||||
|
||||
box.frames = FlxAtlasFrames.fromSparrow('assets/images/weeb/pixelUI/dialogueBox-senpaiMad.png',
|
||||
'assets/images/weeb/pixelUI/dialogueBox-senpaiMad.xml');
|
||||
box.animation.addByPrefix('normalOpen', 'SENPAI ANGRY IMPACT SPEECH', 24, false);
|
||||
box.animation.addByIndices('normal', 'SENPAI ANGRY IMPACT SPEECH', [4], "", 24);
|
||||
|
||||
case 'thorns':
|
||||
box.frames = FlxAtlasFrames.fromSparrow('assets/images/weeb/pixelUI/dialogueBox-evil.png', 'assets/images/weeb/pixelUI/dialogueBox-evil.xml');
|
||||
box.animation.addByPrefix('normalOpen', 'Spirit Textbox spawn', 24, false);
|
||||
box.animation.addByIndices('normal', 'Spirit Textbox spawn', [11], "", 24);
|
||||
|
||||
var face:FlxSprite = new FlxSprite(180, 170).loadGraphic('assets/images/weeb/spiritFaceForward.png');
|
||||
face.setGraphicSize(Std.int(face.width * 6));
|
||||
add(face);
|
||||
}
|
||||
|
||||
box.animation.play('normalOpen');
|
||||
box.setGraphicSize(Std.int(box.width * PlayState.daPixelZoom * 0.9));
|
||||
box.updateHitbox();
|
||||
|
@ -87,7 +118,7 @@ class DialogueBox extends FlxSpriteGroup
|
|||
|
||||
if (!talkingRight)
|
||||
{
|
||||
box.flipX = true;
|
||||
// box.flipX = true;
|
||||
}
|
||||
|
||||
dropText = new FlxText(242, 502, Std.int(FlxG.width * 0.6), "", 32);
|
||||
|
@ -113,6 +144,16 @@ class DialogueBox extends FlxSpriteGroup
|
|||
|
||||
override function update(elapsed:Float)
|
||||
{
|
||||
// HARD CODING CUZ IM STUPDI
|
||||
if (PlayState.SONG.song.toLowerCase() == 'roses')
|
||||
portraitLeft.visible = false;
|
||||
if (PlayState.SONG.song.toLowerCase() == 'thorns')
|
||||
{
|
||||
portraitLeft.color = FlxColor.BLACK;
|
||||
swagDialogue.color = FlxColor.WHITE;
|
||||
dropText.color = FlxColor.BLACK;
|
||||
}
|
||||
|
||||
dropText.text = swagDialogue.text;
|
||||
|
||||
if (box.animation.curAnim != null)
|
||||
|
@ -141,6 +182,8 @@ class DialogueBox extends FlxSpriteGroup
|
|||
if (!isEnding)
|
||||
{
|
||||
isEnding = true;
|
||||
|
||||
if (PlayState.SONG.song.toLowerCase() == 'senpai' || PlayState.SONG.song.toLowerCase() == 'thorns')
|
||||
FlxG.sound.music.fadeOut(2.2, 0);
|
||||
|
||||
new FlxTimer().start(0.2, function(tmr:FlxTimer)
|
||||
|
|
|
@ -165,6 +165,8 @@ class PlayState extends MusicBeatState
|
|||
dialogue = CoolUtil.coolTextFile('assets/data/senpai/senpaiDialogue.txt');
|
||||
case 'roses':
|
||||
dialogue = CoolUtil.coolTextFile('assets/data/roses/rosesDialogue.txt');
|
||||
case 'thorns':
|
||||
dialogue = CoolUtil.coolTextFile('assets/data/thorns/thornsDialogue.txt');
|
||||
}
|
||||
|
||||
if (SONG.song.toLowerCase() == 'spookeez' || SONG.song.toLowerCase() == 'monster' || SONG.song.toLowerCase() == 'south')
|
||||
|
@ -736,6 +738,9 @@ class PlayState extends MusicBeatState
|
|||
case 'senpai':
|
||||
schoolIntro(doof);
|
||||
case 'roses':
|
||||
FlxG.sound.play('assets/sounds/ANGRY' + TitleState.soundExt);
|
||||
schoolIntro(doof);
|
||||
case 'thorns':
|
||||
schoolIntro(doof);
|
||||
default:
|
||||
startCountdown();
|
||||
|
@ -749,6 +754,8 @@ class PlayState extends MusicBeatState
|
|||
schoolIntro(doof);
|
||||
case 'roses':
|
||||
schoolIntro(doof);
|
||||
case 'thorns':
|
||||
schoolIntro(doof);
|
||||
default:
|
||||
startCountdown();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue