Skip to content

Commit

Permalink
umm press "7"
Browse files Browse the repository at this point in the history
  • Loading branch information
Hackx2 committed May 9, 2023
1 parent 493d9bc commit 92bea2e
Show file tree
Hide file tree
Showing 12 changed files with 113 additions and 3 deletions.
Binary file added assets/preload/images/uhm/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions assets/preload/images/uhm/1.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version='1.0' encoding='utf-8'?>
<TextureAtlas imagePath="1.png">
<SubTexture name="boy instance0000" x="0" y="0" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0001" x="320" y="0" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0002" x="0" y="240" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0003" x="320" y="240" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0004" x="640" y="0" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0005" x="640" y="240" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0006" x="0" y="480" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0007" x="320" y="480" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0008" x="640" y="480" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0009" x="0" y="720" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0010" x="320" y="720" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0011" x="640" y="720" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0012" x="960" y="0" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0013" x="960" y="240" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0014" x="960" y="480" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0015" x="960" y="720" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0016" x="0" y="960" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0017" x="320" y="960" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0018" x="640" y="960" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0019" x="960" y="960" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0020" x="1280" y="0" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
<SubTexture name="boy instance0021" x="1280" y="240" width="320" height="240" frameX="0" frameY="0" frameWidth="320" frameHeight="240" />
</TextureAtlas>
4 changes: 2 additions & 2 deletions hmm.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
{
"name": "flixel",
"type": "haxelib",
"version": "5.2.2"
"version": "4.11.0"
},
{
"name": "flixel-addons",
"type": "haxelib",
"version": null
"version": "2.11.0"
},
{
"name": "flixel-tools",
Expand Down
23 changes: 23 additions & 0 deletions source/FlxColorPastel.hx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package;

import flixel.util.FlxColor;

class FlxColorPastel
{
//** Pastel Colors! **/
public static inline var PASTELGREEN:FlxColor = 0xFF92FF92;
public static inline var PASTELLIME:FlxColor = 0xFF5BF85B;
public static inline var PASTELYELLOW:FlxColor = 0xFFFFFFAE;
public static inline var PASTELORANGE:FlxColor = 0xFFFFD381;
public static inline var PASTELRED:FlxColor = 0xFFFF5F5F;
public static inline var PASTELPURPLE:FlxColor = 0xFFFFA1FF;
public static inline var PASTELBLUE:FlxColor = 0xFF8F8FFF;
public static inline var PASTELBROWN:FlxColor = 0xFFFFBF91;
public static inline var PASTELPINK:FlxColor = 0xFFFFC0CB;
public static inline var PASTELMAGENTA:FlxColor = 0xFFFFB1FF;
public static inline var PASTELCYAN:FlxColor = 0xFFA1FFFF;

//** Shades of Black/White**/
public static inline var LIGHTBLACK:FlxColor = 0xFF525252;
public static inline var BETTERBLACK:FlxColor = 0xFF000000;
}
1 change: 1 addition & 0 deletions source/Note.hx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import flixel.util.FlxColor;
import flash.display.BitmapData;
import backend.Conductor;
import editors.ChartingState;
import shaders.ColorSwap;

using StringTools;

Expand Down
1 change: 1 addition & 0 deletions source/StrumNote.hx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package;
import flixel.FlxG;
import flixel.FlxSprite;
import flixel.graphics.frames.FlxAtlasFrames;
import shaders.ColorSwap;

using StringTools;

Expand Down
1 change: 1 addition & 0 deletions source/options/NotesSubState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import flixel.util.FlxSave;
import haxe.Json;
import flixel.tweens.FlxEase;
import flixel.tweens.FlxTween;
import shaders.ColorSwap;
import flixel.util.FlxTimer;
import flixel.input.keyboard.FlxKey;
import flixel.graphics.FlxGraphic;
Expand Down
4 changes: 4 additions & 0 deletions source/options/Stats.hx
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ class Stats extends MusicBeatState
StatChangeables.resetStats();
MusicBeatState.switchState(FlxG.state);
}

if(FlxG.keys.justPressed.SEVEN){
MusicBeatState.switchState(new states.AnimatedImageState("BOYKISSER","uhm/1", "boy instance", true, 21));
}
}

function changeSelection(change:Int = 0)
Expand Down
2 changes: 1 addition & 1 deletion source/ColorSwap.hx → source/shaders/ColorSwap.hx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package;
package shaders;

import flixel.FlxG;
import flixel.system.FlxAssets.FlxShader;
Expand Down
1 change: 1 addition & 0 deletions source/sprites/NoteSplash.hx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package sprites;
import flixel.FlxG;
import flixel.FlxSprite;
import flixel.graphics.frames.FlxAtlasFrames;
import shaders.ColorSwap;

class NoteSplash extends FlxSprite
{
Expand Down
53 changes: 53 additions & 0 deletions source/states/AnimatedImageState.hx
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
package states;

import flixel.FlxG;
import flixel.text.FlxText;
import flixel.FlxSprite;
import flixel.util.FlxColor;

using StringTools;

class AnimatedImageState extends MusicBeatState
{
var background:FlxSprite;
var title:FlxText;
var index:FlxSprite;

public function new(text:String, image:String, animPrefix:String, center:Bool, framerate:Int = 24)
{
super();
FlxG.sound.music.stop();

background = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.WHITE);
add(background);

title = new FlxText();
title.setFormat(Paths.font("PhantomMuff.ttf"), 128, FlxColorPastel.PASTELPINK, CENTER);
title.text = text;
title.y += 25;
title.screenCenter(X);
title.updateHitbox();
add(title);

index = new FlxSprite();
index.frames = Paths.getSparrowAtlas(image);
index.antialiasing = ClientPrefs.globalAntialiasing;
index.animation.addByPrefix('instance', animPrefix, framerate, true);
if (center)
index.screenCenter();
index.animation.play('instance');
index.updateHitbox();
add(index);
};

override function update(elapsed:Float)
{
super.update(elapsed);

if (controls.BACK)
{
MusicBeatState.switchState(new options.Stats());
FlxG.sound.play(Paths.sound('cancelMenu'));
}
}
}
1 change: 1 addition & 0 deletions source/states/TitleState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import sys.thread.Thread;
#end
import flixel.FlxG;
import flixel.FlxSprite;
import shaders.ColorSwap;
import flixel.FlxState;
import flixel.input.keyboard.FlxKey;
import flixel.addons.display.FlxGridOverlay;
Expand Down

0 comments on commit 92bea2e

Please sign in to comment.