Skip to content

Commit

Permalink
zoo wee mama D:
Browse files Browse the repository at this point in the history
  • Loading branch information
charlesisfeline committed Dec 1, 2024
1 parent 554459a commit f9d1dac
Show file tree
Hide file tree
Showing 4 changed files with 101 additions and 44 deletions.
135 changes: 93 additions & 42 deletions assets/preload/data/characters/kanimate-annoyed.json
Original file line number Diff line number Diff line change
@@ -1,43 +1,94 @@
{
"version": "1.0.0",
"offsets": [5, -125],
"renderType": "sparrow",
"name": "Killer Animate (Annoyed)",
"cameraOffsets": [0, 0],
"singTime": 8,
"danceEvery": 1,
"loopHold": false,
"loopHoldFrame": 2,
"healthIcon": {
"offsets": [0, -20],
"id": "kanimate-annoyed"
},
"assetPath": "characters/KillerAnimate_Annoyed",
"animations": [
{
"offsets": [123, -202],
"prefix": "ka annoyed idle",
"name": "idle"
},
{
"offsets": [319, -259],
"prefix": "ka sing left annoyed",
"name": "singLEFT"
},
{
"offsets": [180, -264],
"prefix": "ka sing down annoyed",
"name": "singDOWN"
},
{
"offsets": [97, -150],
"prefix": "ka sing up annoye",
"name": "singUP"
},
{
"offsets": [100, -134],
"prefix": "ka sing right annoyed",
"name": "singRIGHT"
}
]
}
"version": "1.0.0",
"offsets": [
5,
-125
],
"renderType": "sparrow",
"danceEvery": 1,
"loopHoldFrame": 2,
"scale": 1,
"name": "Killer Animate (Annoyed)",
"cameraOffsets": [
0,
0
],
"loopHold": false,
"flipX": false,
"singTime": 8,
"startingAnimation": "idle",
"isPixel": false,
"healthIcon": {
"isPixel": false,
"offsets": [
0,
-20
],
"scale": 1,
"id": "kanimate-annoyed",
"flipX": false
},
"assetPath": "characters/KillerAnimate_Annoyed",
"animations": [
{
"flipY": false,
"offsets": [
115,
-172
],
"frameRate": 24,
"prefix": "ka annoyed idle",
"flipX": false,
"looped": false,
"name": "idle"
},
{
"flipY": false,
"offsets": [
221,
-174
],
"frameRate": 24,
"prefix": "ka sing left annoyed",
"flipX": false,
"looped": false,
"name": "singLEFT"
},
{
"flipY": false,
"offsets": [
165,
-262
],
"frameRate": 24,
"prefix": "ka sing down annoyed",
"flipX": false,
"looped": false,
"name": "singDOWN"
},
{
"flipY": false,
"offsets": [
212,
-109
],
"frameRate": 24,
"prefix": "ka sing up annoye",
"flipX": false,
"looped": false,
"name": "singUP"
},
{
"flipY": false,
"offsets": [
107,
-123
],
"frameRate": 24,
"prefix": "ka sing right annoyed",
"flipX": false,
"looped": false,
"name": "singRIGHT"
}
]
}
4 changes: 2 additions & 2 deletions assets/preload/data/characters/milky-funni.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"version": "1.0.0",
"offsets": [0, 25],
"offsets": [0, -8],
"danceEvery": 1,
"renderType": "sparrow",
"scale": 2,
"loopHoldFrame": 1,
"name": "Milky but funni",
"cameraOffsets": [0, 0],
"flipX": false,
"flipX": true,
"loopHold": true,
"singTime": 8,
"isPixel": true,
Expand Down
Binary file added assets/preload/images/fries.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions source/funkin/ui/title/TitleState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ class TitleState extends MusicBeatState
var maskShader = new LeftMaskShader();

var bg:FunkinSprite;
var introBg:FunkinSprite;

function startIntro():Void
{
Expand All @@ -201,8 +202,13 @@ class TitleState extends MusicBeatState
else
bg = new FunkinSprite(-1).makeSolidColor(FlxG.width + 2, FlxG.height, FlxColor.BLACK);
bg.screenCenter();
bg.visible = false;
add(bg);

introBg = new FunkinSprite(-1).makeSolidColor(FlxG.width + 2, FlxG.height, FlxColor.BLACK);
introBg.screenCenter();
add(introBg);

logoBl = new FlxSprite(-150, -100);
logoBl.frames = Paths.getSparrowAtlas('logoBumpin');
logoBl.animation.addByPrefix('bump', 'logo bumpin', 24);
Expand Down

0 comments on commit f9d1dac

Please sign in to comment.