diff --git a/Project.xml b/Project.xml
index ff321dd49..3d1c1854e 100644
--- a/Project.xml
+++ b/Project.xml
@@ -31,7 +31,13 @@
-
+
+
+
+
+
+
+
@@ -81,4 +87,5 @@
+
diff --git a/art/build-Itch-HTML.bat b/art/build-Itch-HTML.bat
index 725ee7e39..ffa43b54e 100644
--- a/art/build-Itch-HTML.bat
+++ b/art/build-Itch-HTML.bat
@@ -5,7 +5,7 @@ cd ..
echo BUILDING GAME
lime build html5 -final -clean
echo UPLOADING TO ITCH
-butler push ./export/debug/html5/bin ninja-muffin24/ld47:html5
+butler push ./export/release/html5/bin ninja-muffin24/ld47:html5
butler status ninja-muffin24/ld47:html5
echo ITCH SHIT UPDATED LMAOOOOO
pause
\ No newline at end of file
diff --git a/art/build-Itch-WINDOWS.bat b/art/build-Itch-WINDOWS.bat
new file mode 100644
index 000000000..84c127de5
--- /dev/null
+++ b/art/build-Itch-WINDOWS.bat
@@ -0,0 +1,11 @@
+@echo off
+color 0a
+cd ..
+@echo on
+echo BUILDING GAME
+lime build windows -final
+echo UPLOADING TO ITCH
+butler push ./export/release/html5/bin ninja-muffin24/ld47:windows
+butler status ninja-muffin24/ld47:windows
+echo ITCH SHIT UPDATED LMAOOOOO
+pause
\ No newline at end of file
diff --git a/art/icon.png b/art/icon.png
new file mode 100644
index 000000000..72d5b1743
Binary files /dev/null and b/art/icon.png differ
diff --git a/art/icon.png~ b/art/icon.png~
new file mode 100644
index 000000000..380a71c17
Binary files /dev/null and b/art/icon.png~ differ
diff --git a/assets/music/Bopeebo.ogg b/assets/music/Bopeebo.ogg
new file mode 100644
index 000000000..44b10f9cf
Binary files /dev/null and b/assets/music/Bopeebo.ogg differ
diff --git a/assets/music/Bopeebo_Inst.ogg b/assets/music/Bopeebo_Inst.ogg
new file mode 100644
index 000000000..035215f80
Binary files /dev/null and b/assets/music/Bopeebo_Inst.ogg differ
diff --git a/assets/music/Bopeebo_Voices.ogg b/assets/music/Bopeebo_Voices.ogg
new file mode 100644
index 000000000..9a5ef5d58
Binary files /dev/null and b/assets/music/Bopeebo_Voices.ogg differ
diff --git a/assets/music/Fresh.ogg b/assets/music/Fresh.ogg
new file mode 100644
index 000000000..011ca81ec
Binary files /dev/null and b/assets/music/Fresh.ogg differ
diff --git a/assets/music/Fresh_Inst.ogg b/assets/music/Fresh_Inst.ogg
new file mode 100644
index 000000000..63db32e21
Binary files /dev/null and b/assets/music/Fresh_Inst.ogg differ
diff --git a/assets/music/Fresh_Voices.ogg b/assets/music/Fresh_Voices.ogg
new file mode 100644
index 000000000..84e791c5e
Binary files /dev/null and b/assets/music/Fresh_Voices.ogg differ
diff --git a/assets/music/title.ogg b/assets/music/title.ogg
new file mode 100644
index 000000000..92941b0ce
Binary files /dev/null and b/assets/music/title.ogg differ
diff --git a/assets/music/titleShoot.ogg b/assets/music/titleShoot.ogg
new file mode 100644
index 000000000..c9c4f6e33
Binary files /dev/null and b/assets/music/titleShoot.ogg differ
diff --git a/assets/sounds/badnoise1.ogg b/assets/sounds/badnoise1.ogg
new file mode 100644
index 000000000..071626d07
Binary files /dev/null and b/assets/sounds/badnoise1.ogg differ
diff --git a/assets/sounds/badnoise2.ogg b/assets/sounds/badnoise2.ogg
new file mode 100644
index 000000000..e2133ae02
Binary files /dev/null and b/assets/sounds/badnoise2.ogg differ
diff --git a/assets/sounds/badnoise3.ogg b/assets/sounds/badnoise3.ogg
new file mode 100644
index 000000000..28d6b6fe5
Binary files /dev/null and b/assets/sounds/badnoise3.ogg differ
diff --git a/assets/sounds/freshIntro.ogg b/assets/sounds/freshIntro.ogg
new file mode 100644
index 000000000..337444ea0
Binary files /dev/null and b/assets/sounds/freshIntro.ogg differ
diff --git a/assets/sounds/intro1.ogg b/assets/sounds/intro1.ogg
new file mode 100644
index 000000000..a42cb1733
Binary files /dev/null and b/assets/sounds/intro1.ogg differ
diff --git a/assets/sounds/intro2.ogg b/assets/sounds/intro2.ogg
new file mode 100644
index 000000000..990701bba
Binary files /dev/null and b/assets/sounds/intro2.ogg differ
diff --git a/assets/sounds/intro3.ogg b/assets/sounds/intro3.ogg
new file mode 100644
index 000000000..dc660504c
Binary files /dev/null and b/assets/sounds/intro3.ogg differ
diff --git a/assets/sounds/introGo.ogg b/assets/sounds/introGo.ogg
new file mode 100644
index 000000000..b1f0086f8
Binary files /dev/null and b/assets/sounds/introGo.ogg differ
diff --git a/assets/sounds/missnote1.ogg b/assets/sounds/missnote1.ogg
new file mode 100644
index 000000000..371503e91
Binary files /dev/null and b/assets/sounds/missnote1.ogg differ
diff --git a/assets/sounds/missnote2.ogg b/assets/sounds/missnote2.ogg
new file mode 100644
index 000000000..c38c48498
Binary files /dev/null and b/assets/sounds/missnote2.ogg differ
diff --git a/assets/sounds/missnote3.ogg b/assets/sounds/missnote3.ogg
new file mode 100644
index 000000000..59506db6a
Binary files /dev/null and b/assets/sounds/missnote3.ogg differ
diff --git a/assets/sounds/soundTest.mp3 b/assets/sounds/soundTest.mp3
new file mode 100644
index 000000000..f625b1a72
Binary files /dev/null and b/assets/sounds/soundTest.mp3 differ
diff --git a/assets/sounds/soundTest.ogg b/assets/sounds/soundTest.ogg
new file mode 100644
index 000000000..4eea4795d
Binary files /dev/null and b/assets/sounds/soundTest.ogg differ
diff --git a/source/PlayState.hx b/source/PlayState.hx
index b464fd423..394d5d0e8 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -129,7 +129,7 @@ class PlayState extends FlxTransitionableState
switch (swagCounter)
{
case 0:
- FlxG.sound.play('assets/sounds/intro3.mp3', 0.6);
+ FlxG.sound.play('assets/sounds/intro3' + TitleState.soundExt, 0.6);
case 1:
var ready:FlxSprite = new FlxSprite().loadGraphic('assets/images/ready.png');
ready.scrollFactor.set();
@@ -142,7 +142,7 @@ class PlayState extends FlxTransitionableState
ready.destroy();
}
});
- FlxG.sound.play('assets/sounds/intro2.mp3', 0.6);
+ FlxG.sound.play('assets/sounds/intro2' + TitleState.soundExt, 0.6);
case 2:
var set:FlxSprite = new FlxSprite().loadGraphic('assets/images/set.png');
set.scrollFactor.set();
@@ -155,7 +155,7 @@ class PlayState extends FlxTransitionableState
set.destroy();
}
});
- FlxG.sound.play('assets/sounds/intro1.mp3', 0.6);
+ FlxG.sound.play('assets/sounds/intro1' + TitleState.soundExt, 0.6);
case 3:
var go:FlxSprite = new FlxSprite().loadGraphic('assets/images/go.png');
go.scrollFactor.set();
@@ -168,7 +168,7 @@ class PlayState extends FlxTransitionableState
go.destroy();
}
});
- FlxG.sound.play('assets/sounds/introGo.mp3', 0.6);
+ FlxG.sound.play('assets/sounds/introGo' + TitleState.soundExt, 0.6);
case 4:
}
@@ -217,7 +217,7 @@ class PlayState extends FlxTransitionableState
function startSong():Void
{
countingDown = false;
- FlxG.sound.playMusic("assets/music/" + curLevel + "_Inst.mp3");
+ FlxG.sound.playMusic("assets/music/" + curLevel + "_Inst" + TitleState.soundExt);
vocals.play();
}
@@ -236,7 +236,7 @@ class PlayState extends FlxTransitionableState
curSong = songData.song;
- vocals = new FlxSound().loadEmbedded("assets/music/" + curSong + "_Voices.mp3");
+ vocals = new FlxSound().loadEmbedded("assets/music/" + curSong + "_Voices" + TitleState.soundExt);
FlxG.sound.list.add(vocals);
notes = new FlxTypedGroup();
@@ -315,7 +315,6 @@ class PlayState extends FlxTransitionableState
}
unspawnNotes.sort(sortByShit);
- trace('FIRST NOTE ' + unspawnNotes[0]);
}
function sortByShit(Obj1:Note, Obj2:Note):Int
@@ -805,7 +804,7 @@ class PlayState extends FlxTransitionableState
}
combo = 0;
- FlxG.sound.play('assets/sounds/missnote' + FlxG.random.int(1, 3) + ".mp3", FlxG.random.float(0.05, 0.2));
+ FlxG.sound.play('assets/sounds/missnote' + FlxG.random.int(1, 3) + TitleState.soundExt, FlxG.random.float(0.05, 0.2));
boyfriend.stunned = true;