Merge pull request #480 from CyndaquilDAC/alphabet-shit

Alphabet supports spaces and a ton more symbols as well!!
This commit is contained in:
Kade M 2021-05-15 20:17:58 -07:00 committed by GitHub
commit a1bf6eef68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 576 additions and 526 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,19 +1,19 @@
Tutorial:gf:1
Bopeebo:dad:1
Fresh:dad:1
Dadbattle:dad:1
Dad Battle:dad:1
Spookeez:spooky:2
South:spooky:2
Monster:monster:2
Pico:pico:3
Philly:pico:3
Philly Nice:pico:3
Blammed:pico:3
Satin-Panties:mom:4
Satin Panties:mom:4
High:mom:4
Milf:mom:4
Cocoa:parents-christmas:5
Eggnog:parents-christmas:5
Winter-Horrorland:monster-christmas:5
Winter Horrorland:monster-christmas:5
Senpai:senpai:6
Roses:senpai:6
Thorns:spirit:6

Binary file not shown.

Before

Width:  |  Height:  |  Size: 137 KiB

After

Width:  |  Height:  |  Size: 130 KiB

File diff suppressed because it is too large Load Diff

View File

@ -302,6 +302,48 @@ class AlphaCharacter extends FlxSprite
case "!":
animation.addByPrefix(letter, 'exclamation point', 24);
animation.play(letter);
case '_':
animation.addByPrefix(letter, '_', 24);
animation.play(letter);
y += 50;
case "#":
animation.addByPrefix(letter, '#', 24);
animation.play(letter);
case "$":
animation.addByPrefix(letter, '$', 24);
animation.play(letter);
case "%":
animation.addByPrefix(letter, '%', 24);
animation.play(letter);
case "&":
animation.addByPrefix(letter, '&', 24);
animation.play(letter);
case "(":
animation.addByPrefix(letter, '(', 24);
animation.play(letter);
case ")":
animation.addByPrefix(letter, ')', 24);
animation.play(letter);
case "+":
animation.addByPrefix(letter, '+', 24);
animation.play(letter);
case "-":
animation.addByPrefix(letter, '-', 24);
animation.play(letter);
case '"':
animation.addByPrefix(letter, '"', 24);
animation.play(letter);
y -= 0;
case '@':
animation.addByPrefix(letter, '@', 24);
animation.play(letter);
case "^":
animation.addByPrefix(letter, '^', 24);
animation.play(letter);
y -= 0;
case ' ':
animation.addByPrefix(letter, 'space', 24);
animation.play(letter);
}
updateHitbox();

View File

@ -55,7 +55,7 @@ class ChartingState extends MusicBeatState
var bpmTxt:FlxText;
var strumLine:FlxSprite;
var curSong:String = 'Dadbattle';
var curSong:String = 'Dad Battle';
var amountSteps:Int = 0;
var bullshitUI:FlxGroup;
var writingNotesText:FlxText;

View File

@ -149,7 +149,7 @@ class FreeplayState extends MusicBeatState
public function addWeek(songs:Array<String>, weekNum:Int, ?songCharacters:Array<String>)
{
if (songCharacters == null)
songCharacters = ['bf'];
songCharacters = ['dad'];
var num:Int = 0;
for (song in songs)

View File

@ -307,6 +307,9 @@ class PlayState extends MusicBeatState
trace('INFORMATION ABOUT WHAT U PLAYIN WIT:\nFRAMES: ' + Conductor.safeFrames + '\nZONE: ' + Conductor.safeZoneOffset + '\nTS: ' + Conductor.timeScale + '\nBotPlay : ' + FlxG.save.data.botplay);
//dialogue shit
switch (SONG.song.toLowerCase())
{
case 'tutorial':

View File

@ -25,11 +25,11 @@ class StoryMenuState extends MusicBeatState
var weekData:Array<Dynamic> = [
['Tutorial'],
['Bopeebo', 'Fresh', 'Dadbattle'],
['Bopeebo', 'Fresh', 'Dad Battle'],
['Spookeez', 'South', "Monster"],
['Pico', 'Philly', "Blammed"],
['Satin-Panties', "High", "Milf"],
['Cocoa', 'Eggnog', 'Winter-Horrorland'],
['Pico', 'Philly Nice', "Blammed"],
['Satin Panties', "High", "Milf"],
['Cocoa', 'Eggnog', 'Winter Horrorland'],
['Senpai', 'Roses', 'Thorns']
];
var curDifficulty:Int = 1;