Skip to content

Commit

Permalink
swip swap also fuck u til
Browse files Browse the repository at this point in the history
  • Loading branch information
CrusherNotDrip committed Jul 28, 2024
1 parent 274cf66 commit a137fb4
Show file tree
Hide file tree
Showing 3 changed files with 110 additions and 113 deletions.
110 changes: 52 additions & 58 deletions assets/shared/characters/gb-angrier.json
Original file line number Diff line number Diff line change
@@ -1,91 +1,85 @@
{
"animations": [
{
"anim": "idle",
"name": "Idle",
"fps": 24,
"loop": false,
"indices": [],
"offsets": [
0,
0
],
"loop": false,
"fps": 24,
"anim": "idle",
"indices": [],
"name": "Idle"
]
},
{
"offsets": [
29,
-2
],
"loop": false,
"fps": 24,
"anim": "singLEFT",
"name": "left",
"fps": 24,
"loop": false,
"indices": [],
"name": "left"
"offsets": [
29,
-1
]
},
{
"offsets": [
-22,
-22
],
"loop": false,
"fps": 24,
"anim": "singDOWN",
"name": "down",
"fps": 24,
"loop": false,
"indices": [],
"name": "down"
"offsets": [
-21,
-22
]
},
{
"offsets": [
14,
23
],
"loop": false,
"fps": 24,
"anim": "singUP",
"name": "up",
"fps": 24,
"loop": false,
"indices": [],
"name": "up"
"offsets": [
15,
23
]
},
{
"offsets": [
-27,
-1
],
"loop": false,
"fps": 24,
"anim": "singRIGHT",
"name": "right",
"fps": 24,
"loop": false,
"indices": [],
"name": "right"
},
{
"offsets": [
0,
0
],
"indices": [
10,
11,
12,
13
],
"fps": 24,
"anim": "idle-loop",
"loop": true,
"name": "Idle"
-26,
-1
]
}
],
"vocals_file": "gb",
"no_antialiasing": false,
"image": "characters/gameboy_really_angry",
"image": "characters/ANGRYgb",
"scale": 1,
"sing_duration": 6.1,
"healthicon": "gb-angry",

"position": [
21,
16,
170
],
"healthicon": "gb-angry",
"flip_x": false,
"camera_position": [
-40,
-34,
-3
],
"sing_duration": 6.1,
"scale": 1,

"flip_x": false,
"no_antialiasing": false,
"vocals_file": "gb",

"note_colors": [
["FF00EB", "FFFFFF", "4C0047"],
["A14DD9", "FFFFFF", "381B4C"],
["FF00EB", "FFFFFF", "4C0047"],
["A14DD9", "FFFFFF", "381B4C"]
],

"_editor_isPlayer": false
}
110 changes: 58 additions & 52 deletions assets/shared/characters/gb-angry.json
Original file line number Diff line number Diff line change
@@ -1,85 +1,91 @@
{
"animations": [
{
"anim": "idle",
"name": "Idle",
"fps": 24,
"loop": false,
"indices": [],
"offsets": [
0,
0
]
},
{
"anim": "singLEFT",
"name": "left",
"fps": 24,
],
"loop": false,
"fps": 24,
"anim": "idle",
"indices": [],
"offsets": [
29,
-1
]
"name": "Idle"
},
{
"anim": "singDOWN",
"name": "down",
"fps": 24,
"offsets": [
29,
-2
],
"loop": false,
"fps": 24,
"anim": "singLEFT",
"indices": [],
"offsets": [
-21,
-22
]
"name": "left"
},
{
"anim": "singUP",
"name": "up",
"fps": 24,
"offsets": [
-22,
-22
],
"loop": false,
"fps": 24,
"anim": "singDOWN",
"indices": [],
"name": "down"
},
{
"offsets": [
15,
14,
23
]
],
"loop": false,
"fps": 24,
"anim": "singUP",
"indices": [],
"name": "up"
},
{
"anim": "singRIGHT",
"name": "right",
"fps": 24,
"offsets": [
-27,
-1
],
"loop": false,
"fps": 24,
"anim": "singRIGHT",
"indices": [],
"name": "right"
},
{
"offsets": [
-26,
-1
]
0,
0
],
"indices": [
10,
11,
12,
13
],
"fps": 24,
"anim": "idle-loop",
"loop": true,
"name": "Idle"
}
],
"image": "characters/ANGRYgb",
"scale": 1,
"sing_duration": 6.1,
"healthicon": "gb-angry",

"vocals_file": "gb",
"no_antialiasing": false,
"image": "characters/gameboy_really_angry",
"position": [
16,
21,
170
],
"healthicon": "gb-angry",
"flip_x": false,
"camera_position": [
-34,
-40,
-3
],

"flip_x": false,
"no_antialiasing": false,
"vocals_file": "gb",

"note_colors": [
["FF00EB", "FFFFFF", "4C0047"],
["A14DD9", "FFFFFF", "381B4C"],
["FF00EB", "FFFFFF", "4C0047"],
["A14DD9", "FFFFFF", "381B4C"]
],

"sing_duration": 6.1,
"scale": 1,
"_editor_isPlayer": false
}
3 changes: 0 additions & 3 deletions source/states/stages/GBStage.hx
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,6 @@ class GBStage extends BaseStage
if(dad.animOffsets.exists('scared'))
dad.playAnim('scared', true);

if(gf != null && gf.animOffsets.exists('scared'))
gf.playAnim('scared', true);

FlxTween.tween(lightning, {alpha: 0}, 1.8, {onComplete: function(_) {
isLightning = false;
}});
Expand Down

0 comments on commit a137fb4

Please sign in to comment.