Skip to content

Commit a137c97

Browse files
AbnormalPoofHundrec
authored andcommitted
Re-export Girlfriend (Dark) to texture atlas
1 parent 2da337d commit a137c97

File tree

7 files changed

+2109
-94
lines changed

7 files changed

+2109
-94
lines changed

preload/data/characters/gf-dark.json

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,39 @@
11
{
22
"version": "1.0.0",
33
"name": "Girlfriend (Dark)",
4-
"renderType": "sparrow",
5-
"assetPath": "characters/gf_dark",
4+
"renderType": "animateatlas",
5+
"assetPath": "shared:characters/gf-dark",
66
"startingAnimation": "danceRight",
7-
"healthIcon": {
8-
"id": "gf",
9-
"flipX": false
7+
"offsets": [0, -165],
8+
"cameraOffsets": [0, -165],
9+
"atlasSettings": {
10+
"useRenderTexture": true
1011
},
11-
"singTime": 8.0,
1212
"animations": [
1313
{
1414
"name": "danceLeft",
15-
"prefix": "GF Dancing Beat",
16-
"frameIndices": [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14],
17-
"offsets": [0, -9]
15+
"prefix": "Idle",
16+
"frameIndices": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]
1817
},
1918
{
2019
"name": "danceRight",
21-
"prefix": "GF Dancing Beat",
20+
"prefix": "Idle",
2221
"frameIndices": [
2322
15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29
24-
],
25-
"offsets": [0, -9]
26-
},
27-
{
28-
"name": "sad",
29-
"prefix": "gf sad",
30-
"frameIndices": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
31-
"offsets": [2, -21]
32-
},
33-
{
34-
"name": "cheer",
35-
"prefix": "GF Cheer",
36-
"offsets": [0, 0]
23+
]
3724
},
3825
{
3926
"name": "combo50",
40-
"prefix": "GF Cheer",
41-
"offsets": [0, 0]
27+
"prefix": "Cheer"
4228
},
4329
{
4430
"name": "drop70",
45-
"prefix": "gf sad",
46-
"frameIndices": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
47-
"offsets": [2, -21]
31+
"prefix": "Crying",
32+
"frameIndices": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
4833
},
4934
{
5035
"name": "scared",
51-
"prefix": "GF FEAR",
52-
"offsets": [-2, -17],
36+
"prefix": "Fear",
5337
"frameIndices": [0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3]
5438
}
5539
]

preload/scripts/characters/gf-dark.hxc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import flixel.FlxG;
22
import funkin.audio.FunkinSound;
3-
import funkin.play.character.SparrowCharacter;
3+
import funkin.play.character.AnimateAtlasCharacter;
44
import funkin.play.GameOverSubState;
55
import funkin.play.character.BaseCharacter;
66
import funkin.data.character.CharacterDataParser;
77
import funkin.play.character.CharacterType;
88
import funkin.play.PlayState;
99

10-
class GirlfriendDarkCharacter extends SparrowCharacter
10+
class GirlfriendDarkCharacter extends AnimateAtlasCharacter
1111
{
1212
function new()
1313
{
@@ -32,7 +32,7 @@ class GirlfriendDarkCharacter extends SparrowCharacter
3232
if (normalChar != null)
3333
{
3434
normalChar.playAnimation(name, restart, ignoreOther);
35-
normalChar.setPosition(this.x + 325, this.y + 485);
35+
normalChar.setPosition(this.x - 23, this.y);
3636
}
3737
}
3838

0 commit comments

Comments
 (0)