RELEAAASE

ninjamuffin99 · Jan 26, 2020 · 4681f0b · 4681f0b
1 parent ac3ae23
commit 4681f0b
Show file tree

Hide file tree

Showing 26 changed files with 102 additions and 24 deletions.
diff --git a/additionalShit/buildScripts/itchUploadWINDOWS.bat b/additionalShit/buildScripts/itchUploadWINDOWS.bat
@@ -0,0 +1,9 @@
+@echo off
+color 0e
+cd ..
+cd ..
+@echo on
+lime build windows -release
+butler push ./export/release/windows/bin ninja-muffin24/pixel-day-2020:windows
+butler status ninja-muffin24/pixel-day-2020:windows
+pause
diff --git a/assets/music/fluffydream.ogg b/assets/music/fluffydream.ogg
diff --git a/assets/music/pillow.ogg b/assets/music/pillow.ogg
diff --git a/assets/music/ritz.ogg b/assets/music/ritz.ogg
diff --git a/assets/sounds/Munchsound1.ogg b/assets/sounds/Munchsound1.ogg
diff --git a/assets/sounds/Munchsound2.ogg b/assets/sounds/Munchsound2.ogg
diff --git a/assets/sounds/Munchsound3.ogg b/assets/sounds/Munchsound3.ogg
diff --git a/assets/sounds/Munchsound4.ogg b/assets/sounds/Munchsound4.ogg
diff --git a/assets/sounds/allcheesesunlocked.ogg b/assets/sounds/allcheesesunlocked.ogg
diff --git a/assets/sounds/checkpoint.ogg b/assets/sounds/checkpoint.ogg
diff --git a/assets/sounds/collectCheese.ogg b/assets/sounds/collectCheese.ogg
diff --git a/assets/sounds/damageTaken.ogg b/assets/sounds/damageTaken.ogg
diff --git a/assets/sounds/discoverysound.ogg b/assets/sounds/discoverysound.ogg
diff --git a/assets/sounds/doubleJump.ogg b/assets/sounds/doubleJump.ogg
diff --git a/assets/sounds/jump.ogg b/assets/sounds/jump.ogg
diff --git a/assets/sounds/keyboardtyping.ogg b/assets/sounds/keyboardtyping.ogg
diff --git a/assets/sounds/ritzstartjingle.ogg b/assets/sounds/ritzstartjingle.ogg
diff --git a/assets/sounds/startbleep.ogg b/assets/sounds/startbleep.ogg
diff --git a/assets/sounds/talksound.ogg b/assets/sounds/talksound.ogg
diff --git a/assets/sounds/talksound1.ogg b/assets/sounds/talksound1.ogg
diff --git a/source/BootState.hx b/source/BootState.hx
@@ -8,13 +8,19 @@ import flixel.FlxState;
 
 class BootState extends FlxState
 {
+    public static var soundEXT:String = ".mp3";
     override function create() {
+
+        #if desktop
+            soundEXT = ".ogg";
+        #end
+
         var daText:FlxText = new FlxText(0, 0, 0, "ninjamuffin99\nMKMaffo\nKawaisprite\nand Digimin\npresent...",16);
         daText.alignment = CENTER;
         daText.screenCenter();
         add(daText);
 
-        FlxG.sound.play(AssetPaths.checkpoint__mp3, 0.6);
+        FlxG.sound.play('assets/sounds/checkpoint' + soundEXT, 0.6);
 
         new FlxTimer().start(2, function(tmr:FlxTimer){FlxG.switchState(new MenuState());});
 

diff --git a/source/DialogueSubstate.hx b/source/DialogueSubstate.hx
@@ -35,7 +35,7 @@ class DialogueSubstate extends FlxSubState
 
         dialogueText = new TypeTextTwo(0, 0, FlxG.width, d, 16);
         dialogueText.scrollFactor.set();
-        dialogueText.sounds = [FlxG.sound.load('assets/sounds/talksound.mp3'), FlxG.sound.load('assets/sounds/talksound1.mp3')];
+        dialogueText.sounds = [FlxG.sound.load('assets/sounds/talksound' + BootState.soundEXT), FlxG.sound.load('assets/sounds/talksound1' + BootState.soundEXT)];
         dialogueText.finishSounds = true;
         dialogueText.skipKeys = ["E", "F", 'X', 'SPACE', 'Z', 'W', "UP"];
 		add(dialogueText);

diff --git a/source/EndState.hx b/source/EndState.hx
@@ -19,25 +19,56 @@ class EndState extends FlxState
         "Kawaisprite",
         "",
         "",
-        "Programming and level design",
+        "Programming, design and writing",
         "ninjamuffin99",
         "", 
         "Character art and animation",
         "MKMaffo",
         "",
-        "Tile and background art",
+        "Tile, background art and additional writing",
         "Digimin",
         "",
         "Music and sounds",
         "Kawaisprite",
-        ""
+        "",
+        "",
+        "Made with HaxeFlixel",
+        "",
+        "Source code",
+        "github.com/ninjamuffin99/actualPixelDay2020",
+        "",
+        "Map editor",
+        "OGMO 3",
+        "",
+        "",
+        "",
+        "Special Thanks",
+        "OzoneOrange",
+        "Wandaboy",
+        "Snackers",
+        "Carmet",
+        "HenryEYES",
+        "FuShark",
+        "PhantomArcade",
+        "GeoKureli",
+        "Joe Swanson from Family Guy",
+        "MuccTucc",
+        "SuperMega",
+        "DonRRR",
+        "",
+        "Tom Fulp and Newgrounds"
+
 
     ];
 
     var text:FlxText;
-
+    var dumbass:Checkpoint;
     override function create() {
-        text = new FlxText(0, FlxG.height, 0, "", 16);
+        text = new FlxText(0, FlxG.height + 100, 0, "", 16);
+        dumbass = new Checkpoint(400, 1600, "Huh, looks like it's over. Thanks for playing Ritz! I'm still kinda hungry though... go find me more cheese!");
+        add(dumbass);
+
+        FlxG.sound.playMusic('assets/music/ritz' + BootState.soundEXT, 0.8);
 
         for (i in creds)
         {
@@ -57,13 +88,36 @@ class EndState extends FlxState
     }
 
     var credsCounter:Int = 0;
+    var finishedShit:Bool = false;
     override function update(elapsed:Float) {
         credsCounter++;
 
+        FlxG.watch.addQuick('da', text.y);
+        if (dumbass.y < FlxG.height - 110)
+        {
+            if (finishedShit)
+            {
+                FlxG.switchState(new MenuState());
+            }
+            else
+            {
+                finishedShit = true;
+                openSubState(new DialogueSubstate(dumbass.dialogue));
+            }
+        }
+
+        if (text.y < -900 && FlxG.sound.music.volume == 0.8)
+        {
+            FlxG.sound.music.fadeOut(2, 0);
+        }
+
+
         if (credsCounter >= 2)
         {
             credsCounter = 0;
-            text.y -= 1.75;
+            text.y -= 1.45;
+
+            dumbass.y -= 1.45;
         }
 
 

diff --git a/source/MenuState.hx b/source/MenuState.hx
@@ -13,7 +13,7 @@ class MenuState extends FlxState
     var title:FlxSprite;
     override public function create() {
 
-        FlxG.sound.playMusic(AssetPaths.fluffydream__mp3, 0);
+        FlxG.sound.playMusic('assets/music/fluffydream' + BootState.soundEXT, 0);
         FlxG.sound.music.fadeIn(5, 0, 1);
         FlxG.camera.fade(FlxColor.WHITE, 5, true);
 
@@ -49,11 +49,11 @@ class MenuState extends FlxState
                 {
                     FlxFlicker.flicker(pressStart, 1, 0.04, false, true, function(flic:FlxFlicker)
                     {
-                        FlxG.sound.play(AssetPaths.ritzstartjingle__mp3);
+                        FlxG.sound.play('assets/sounds/ritzstartjingle' + BootState.soundEXT);
                         title.animation.play('ritz');
                     });
 
-                    FlxG.sound.play(AssetPaths.startbleep__mp3);
+                    FlxG.sound.play('assets/sounds/startbleep' + BootState.soundEXT);
                     if (FlxG.sound.music != null)
                     {
                         FlxG.sound.music.stop();
@@ -65,11 +65,11 @@ class MenuState extends FlxState
             {
                 FlxFlicker.flicker(pressStart, 1, 0.04, false, true, function(flic:FlxFlicker)
                 {
-                    FlxG.sound.play(AssetPaths.ritzstartjingle__mp3);
+                    FlxG.sound.play('assets/sounds/ritzstartjingle' + BootState.soundEXT);
                     title.animation.play('ritz');
                 });
 
-                FlxG.sound.play(AssetPaths.startbleep__mp3);
+                FlxG.sound.play('assets/sounds/startbleep' + BootState.soundEXT);
                 if (FlxG.sound.music != null)
                 {
                     FlxG.sound.music.stop();

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -184,6 +184,8 @@ class PlayState extends FlxState
 				grpSecretTriggers.add(new SecretTrigger(e.x, e.y, e.width, e.height));
 			case 'locked':
 				locked = new FlxSprite(e.x, e.y).loadGraphic(AssetPaths.door__png);
+				locked.setGraphicSize(192, 64);
+				locked.updateHitbox();
 				locked.immovable = true;
 				add(locked);
 		}
@@ -206,6 +208,7 @@ class PlayState extends FlxState
 	// One of them is a ticker (cheeseAdding) and the other is to see if its in the state of adding cheese
 	private var cheeseAdding:Int = 0;
 	private var addingCheese:Bool = false;
+	private var ending:Bool = false;
 	override public function update(elapsed:Float):Void
 	{
 		FlxG.watch.addMouse();
@@ -244,15 +247,21 @@ class PlayState extends FlxState
 		});
 		FlxG.collide(level, player);
 
-		if (player.x > level.width)
-			FlxG.switchState(new EndState());
+		if (player.x > level.width && !ending)
+		{
+			ending = true;
+			FlxG.camera.fade(FlxColor.BLACK, 2, false, function()
+				{
+					FlxG.switchState(new EndState());
+				});
+		}
 
 		if (FlxG.collide(locked, player))
 		{
 			if (coinCount >= cheeseNeeded)
 			{
 				locked.kill();
-				FlxG.sound.play(AssetPaths.allcheesesunlocked__mp3);
+				FlxG.sound.play('assets/sounds/allcheesesunlocked' + BootState.soundEXT);
 				FlxG.sound.music.volume = 0;
 			}
 		}
@@ -283,7 +292,7 @@ class PlayState extends FlxState
 				sT.hasTriggered = true;
 				var oldVol:Float = FlxG.sound.music.volume;
 				FlxG.sound.music.volume = 0.1;
-				FlxG.sound.play(AssetPaths.discoverysound__mp3, 1, false, null, true, function()
+				FlxG.sound.play('assets/sounds/discoverysound' + BootState.soundEXT, 1, false, null, true, function()
 					{
 						FlxG.sound.music.volume = oldVol;
 					});
@@ -306,7 +315,7 @@ class PlayState extends FlxState
 
 				player.gettingHurt = true;
 				player.animation.play('fucking died lmao');
-				FlxG.sound.play(AssetPaths.damageTaken__mp3, 0.6);
+				FlxG.sound.play('assets/sounds/damageTaken' + BootState.soundEXT, 0.6);
 
 				new FlxTimer().start(0.5, function (tmr:FlxTimer)
 				{
@@ -352,7 +361,7 @@ class PlayState extends FlxState
 
 				c.isCurCheckpoint = true;
 				curCheckpoint = c;
-				FlxG.sound.play(AssetPaths.checkpoint__mp3, 0.8);
+				FlxG.sound.play('assets/sounds/checkpoint' + BootState.soundEXT, 0.8);
 			}
 
 			if (cheeseHolding.length > 0)
@@ -374,7 +383,7 @@ class PlayState extends FlxState
 				grpDisplayCheese.members.pop();
 				cheeseAdding = 0;
 
-				FlxG.sound.play('assets/sounds/Munchsound' + FlxG.random.int(1, 4) + ".mp3", FlxG.random.float(0.7, 1));
+				FlxG.sound.play('assets/sounds/Munchsound' + FlxG.random.int(1, 4) + BootState.soundEXT, FlxG.random.float(0.7, 1));
 			}
 
 			if (cheeseHolding.length == 0)
@@ -387,7 +396,7 @@ class PlayState extends FlxState
 		{
 			if (!p.gettingHurt)
 			{
-				FlxG.sound.play(AssetPaths.collectCheese__mp3, 0.6);
+				FlxG.sound.play('assets/sounds/collectCheese' + BootState.soundEXT, 0.6);
 				cheeseHolding.push(daCheese);
 				grpCheese.remove(daCheese, true);
 
@@ -413,7 +422,7 @@ class PlayState extends FlxState
 
 	private function musicHandling():Void
 	{
-		FlxG.sound.playMusic('assets/music/' + musicQueue + ".mp3", 0.7);
+		FlxG.sound.playMusic('assets/music/' + musicQueue + BootState.soundEXT, 0.7);
 		switch (musicQueue)
 		{
 			case "pillow":

diff --git a/source/Player.hx b/source/Player.hx
@@ -212,7 +212,7 @@ class Player extends FlxSprite
                 //velocity.y -= 480;
                 velocity.y -= baseJumpStrength * 2;
                 jumped = true;
-                FlxG.sound.play(AssetPaths.jump__mp3, 0.5);
+                FlxG.sound.play('assets/sounds/jump' + BootState.soundEXT, 0.5);
             }   
         }
         else
@@ -256,7 +256,7 @@ class Player extends FlxSprite
 
                 velocity.y -= 600;
                 doubleJumped = true;
-                FlxG.sound.play(AssetPaths.doubleJump__mp3, 0.75);
+                FlxG.sound.play('assets/sounds/doubleJump' + BootState.soundEXT, 0.75);
             }
         }