Revert "Revert "tried to port whitty""

This reverts commit 816ae91.

Project.xml

@@ -82,6 +82,7 @@
 		<library name="week5"    preload="true"/>
 		<library name="week6"    preload="true"/> 
 		<library name="week7"    preload="true"/> 
+		<library name="backalley"    preload="true"/> 
 	</section>
 
 	<section if="NO_PRELOAD_ALL">
@@ -93,6 +94,7 @@
 		<library name="week5"    preload="false"/>
 		<library name="week6"    preload="false"/>
 		<library name="week7"    preload="false"/> 
+		<library name="backalley"    preload="false"/> 
 	</section>
 
 	<!-- def not needed especially because of week 1
@@ -113,6 +115,8 @@
 	<assets path="assets/week6"    library="week6"    exclude="*.mp3" unless="web"/>
 	<assets path="assets/week7"    library="week7"    exclude="*.ogg" if="web"/>
 	<assets path="assets/week7"    library="week7"    exclude="*.mp3" unless="web"/>
+	<assets path="assets/backalley"    library="backalley"    exclude="*.ogg" if="web"/>
+	<assets path="assets/backalley"    library="backalley"    exclude="*.mp3" unless="web"/>
 
 	<!-- _______________________________ Libraries ______________________________ -->
 

assets/data/charts/lo-fight/meta.json

@@ -0,0 +1,4 @@
+{
+    "format": "crow",
+    "overrideCountdownStory": false
+}

assets/data/weeks/backalley.json

@@ -0,0 +1,11 @@
+{
+	"name": "backalley",
+	"description": "DADDY DEAREST",
+	"songs": ["Lo Fight"],
+	"defaultIcons": ["dad"],
+	"defaultColors": [-4621347],
+
+	"defaultDifficulty": "Normal",
+	"difficulties": ["Hard"],
+	"displayCharacters": ["dad", "boyfriend", "gf"]
+}

source/music/Song.hx

@@ -16,11 +16,6 @@ class Song
 		{*/
 			var fixData:String->String = function(str:String)
 			{
-				while (!str.endsWith("}"))
-				{
-					str = str.substr(0, str.length - 1);
-				}
-
 				return str;
 			};
 
@@ -39,11 +34,6 @@ class Song
 
 			metaData = meta;
 
-			currentSong.noteLength = 0;
-
-			for (section in currentSong.sectionList)
-				currentSong.noteLength += section.length;
-
 			if (metaData.comboSkin == null)
 				metaData.comboSkin = 'default';
 			if (metaData.countdownSkin == null)

source/objects/Stage.hx

@@ -732,6 +732,22 @@ class Stage
 					stageInstance.attributes.set('tankAngle', FlxG.random.int(-90, 45));
 					stageInstance.attributes.set('tankSpeed', FlxG.random.float(5, 7));
 				}
+			case 'backalley':
+					{
+						stageInstance.defaultZoom = 0.90;
+
+						stageInstance.camPosList.opponentPositions = [{x: 100, y: -100}];
+
+						var background:BGSprite = new BGSprite({path: 'whittyBack', library: 'backalley'}, {x: -600, y: -200}, {x: 0.9, y: 0.9});
+						background.ID = 0;
+						group.set('back', background);
+
+						var front:BGSprite = new BGSprite({path: 'whittyFront', library: 'backalley'}, {x: -650, y: 600}, {x: 0.9, y: 0.9});
+						front.scale.set(1.1, 1.1);
+						front.updateHitbox();
+						front.ID = 1;
+						group.set('front', front);
+					}
 			default:
 				{
 					stageInstance.defaultZoom = 0.90;

source/states/PlayState.hx

@@ -343,6 +343,8 @@ class PlayState extends MusicBeatState
 						'dark-school';
 					case 'ugh' | 'guns' | 'stress':
 						'warzone';
+					case 'lo-fight':
+						'backalley';	
 					default:
 						'stage-error';
 				};