AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1662 from CyndaquilDAC/cleaner-dialogue-code

Browse Source 
Cleaner dialogue code
This commit is contained in:
Kade M 2021-08-08 13:43:38 -07:00 committed by GitHub
commit 1873a94a6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/preload/data/roses/rosesDialogue.txt → assets/preload/data/roses/dialogue.txt
View File

@ -1,3 +1,3 @@
:dad:Not bad for an ugly worm. :dad:Not bad for an ugly worm.
:dad:But this time I'll rip your nuts off right after your girlfriend finishes gargling mine. :dad:But this time I'll rip your nuts off right after your girlfriend finishes gargling mine.
:bf:Bop beep be be skdoo bep :bf:Bop beep be be skdoo bep

4
assets/preload/data/senpai/senpaiDialogue.txt → assets/preload/data/senpai/dialogue.txt
View File

@ -1,3 +1,3 @@
:dad:Ah, a new fair maiden has come in search of true love! :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. :dad:A serenade between gentlemen shall decide where her beautiful heart shall reside.
:bf:Beep bo bop :bf:Beep bo bop

8
assets/preload/data/thorns/thornsDialogue.txt → assets/preload/data/thorns/dialogue.txt
View File

@ -1,5 +1,5 @@
:dad:Direct contact with real humans, after being trapped in here for so long... :dad:Direct contact with real humans, after being trapped in here for so long...
:dad:and HER of all people. :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 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:I'll beat you and make you take my place.
:dad:You don't mind your bodies being borrowed right? It's only fair... :dad:You don't mind your bodies being borrowed right? It's only fair...

29
source/PlayState.hx
View File

@ -456,32 +456,11 @@ class PlayState extends MusicBeatState
trace('INFORMATION ABOUT WHAT U PLAYIN WIT:\nFRAMES: ' + PlayStateChangeables.safeFrames + '\nZONE: ' + Conductor.safeZoneOffset + '\nTS: ' trace('INFORMATION ABOUT WHAT U PLAYIN WIT:\nFRAMES: ' + PlayStateChangeables.safeFrames + '\nZONE: ' + Conductor.safeZoneOffset + '\nTS: '
+ Conductor.timeScale + '\nBotPlay : ' + PlayStateChangeables.botPlay); + Conductor.timeScale + '\nBotPlay : ' + PlayStateChangeables.botPlay);
// dialogue shit switch(songLowercase)
switch (songLowercase)
{ {
case 'tutorial': //if the song has dialogue, so we don't accidentally try to load a nonexistant file and crash the game
dialogue = ["Hey you're pretty cute.", 'Use the arrow keys to keep up \nwith me singing.']; case 'senpai' | 'roses' | 'thorns':
case 'bopeebo': dialogue = CoolUtil.coolTextFile(Paths.txt('data/' + songLowercase + '/dialogue'));
dialogue = [
'HEY!',
"You think you can just sing\nwith my daughter like that?",
"If you want to date her...",
"You're going to have to go \nthrough ME first!"
];
case 'fresh':
dialogue = ["Not too shabby boy.", ""];
case 'dadbattle':
dialogue = [
"gah you think you're hot stuff?",
"If you can beat me here...",
"Only then I will even CONSIDER letting you\ndate my daughter!"
];
case 'senpai':
dialogue = CoolUtil.coolTextFile(Paths.txt('data/senpai/senpaiDialogue'));
case 'roses':
dialogue = CoolUtil.coolTextFile(Paths.txt('data/roses/rosesDialogue'));
case 'thorns':
dialogue = CoolUtil.coolTextFile(Paths.txt('data/thorns/thornsDialogue'));
} }
// defaults if no stage was found in chart // defaults if no stage was found in chart