Skip to content
This repository has been archived by the owner on Sep 16, 2024. It is now read-only.

Alphabet supports spaces and a ton more symbols as well!! #480

Merged
merged 2 commits into from
May 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions assets/preload/data/dad battle/dad battle-easy.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/preload/data/dad battle/dad battle-hard.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/preload/data/dad battle/dad battle.json

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion assets/preload/data/dadbattle/dadbattle-easy.json

This file was deleted.

1 change: 0 additions & 1 deletion assets/preload/data/dadbattle/dadbattle-hard.json

This file was deleted.

1 change: 0 additions & 1 deletion assets/preload/data/dadbattle/dadbattle.json

This file was deleted.

8 changes: 4 additions & 4 deletions assets/preload/data/freeplaySonglist.txt
Original file line number Diff line number Diff line change
@@ -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

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Binary file modified assets/preload/images/alphabet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,007 changes: 506 additions & 501 deletions assets/preload/images/alphabet.xml

Large diffs are not rendered by default.

44 changes: 43 additions & 1 deletion source/Alphabet.hx
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ class AlphaCharacter extends FlxSprite

public static var numbers:String = "1234567890";

public static var symbols:String = "|~#$%()*+-:;<=>@[]^_.,'!?";
public static var symbols:String = "|~#$%()*+-:;<=>@[]^_.,'!? ";

public var row:Int = 0;

Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion source/ChartingState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion source/FreeplayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 5 additions & 2 deletions source/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,10 @@ class PlayState extends MusicBeatState
Conductor.changeBPM(SONG.bpm);

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':
Expand All @@ -320,7 +323,7 @@ class PlayState extends MusicBeatState
];
case 'fresh':
dialogue = ["Not too shabby boy.", ""];
case 'dadbattle':
case 'dad battle':
dialogue = [
"gah you think you're hot stuff?",
"If you can beat me here...",
Expand Down
8 changes: 4 additions & 4 deletions source/StoryMenuState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down