Skip to content

Commit

Permalink
note fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Blantados
Blantados committed Oct 22, 2024
1 parent c9d5f8c commit a20b087
Show file tree
Hide file tree
Showing 9 changed files with 296 additions and 272 deletions.
86 changes: 86 additions & 0 deletions assets/shared/images/characters/darnell.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="darnell.png">
<!-- Created with Adobe Animate version 21.0.6.41649 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="Darnell Idle0000" x="0" y="0" width="394" height="487" pivotX="2.85" pivotY="0"/>
<SubTexture name="Darnell Idle0001" x="399" y="0" width="394" height="487"/>
<SubTexture name="Darnell Idle0002" x="798" y="0" width="394" height="487"/>
<SubTexture name="Darnell Idle0003" x="798" y="0" width="394" height="487"/>
<SubTexture name="Darnell Idle0004" x="1197" y="0" width="394" height="487"/>
<SubTexture name="Darnell Idle0005" x="1197" y="0" width="394" height="487"/>
<SubTexture name="Darnell Idle0006" x="1596" y="0" width="394" height="487"/>
<SubTexture name="Darnell Idle0007" x="1596" y="0" width="394" height="487"/>
<SubTexture name="Darnell Idle0008" x="1995" y="0" width="394" height="487"/>
<SubTexture name="Darnell Idle0009" x="1995" y="0" width="394" height="487"/>
<SubTexture name="Darnell Idle0010" x="2394" y="0" width="394" height="487"/>
<SubTexture name="Darnell Idle0011" x="2394" y="0" width="394" height="487"/>
<SubTexture name="Darnell Idle0012" x="2793" y="0" width="394" height="487"/>
<SubTexture name="Darnell Idle0013" x="2793" y="0" width="394" height="487"/>
<SubTexture name="Darnell Pose Down0000" x="3192" y="0" width="426" height="426" pivotX="23.3" pivotY="-37.65"/>
<SubTexture name="Darnell Pose Down0001" x="3623" y="0" width="426" height="426"/>
<SubTexture name="Darnell Pose Down0002" x="0" y="492" width="426" height="426"/>
<SubTexture name="Darnell Pose Down0003" x="431" y="492" width="426" height="426"/>
<SubTexture name="Darnell Pose Down0004" x="431" y="492" width="426" height="426"/>
<SubTexture name="Darnell Pose Down0005" x="862" y="492" width="426" height="426"/>
<SubTexture name="Darnell Pose Down0006" x="862" y="492" width="426" height="426"/>
<SubTexture name="Darnell Pose Down0007" x="1293" y="492" width="426" height="426"/>
<SubTexture name="Darnell Pose Down0008" x="1293" y="492" width="426" height="426"/>
<SubTexture name="Darnell Pose Down0009" x="1724" y="492" width="426" height="426"/>
<SubTexture name="Darnell Pose Down0010" x="1724" y="492" width="426" height="426"/>
<SubTexture name="Darnell Pose Down0011" x="2155" y="492" width="426" height="426"/>
<SubTexture name="Darnell Pose Down0012" x="2155" y="492" width="426" height="426"/>
<SubTexture name="Darnell Pose Down0013" x="2586" y="492" width="426" height="426"/>
<SubTexture name="Darnell Pose Down0014" x="2586" y="492" width="426" height="426"/>
<SubTexture name="Darnell Pose Down0015" x="1293" y="492" width="426" height="426"/>
<SubTexture name="Darnell pose right0000" x="3017" y="492" width="423" height="468" pivotX="15.35" pivotY="-23.25"/>
<SubTexture name="Darnell pose right0001" x="3445" y="492" width="423" height="468"/>
<SubTexture name="Darnell pose right0002" x="0" y="965" width="423" height="468"/>
<SubTexture name="Darnell pose right0003" x="428" y="965" width="423" height="468"/>
<SubTexture name="Darnell pose right0004" x="856" y="965" width="423" height="468"/>
<SubTexture name="Darnell pose right0005" x="1284" y="965" width="423" height="468"/>
<SubTexture name="Darnell pose right0006" x="1712" y="965" width="423" height="468"/>
<SubTexture name="Darnell pose right0007" x="1712" y="965" width="423" height="468"/>
<SubTexture name="Darnell pose right0008" x="2140" y="965" width="423" height="468"/>
<SubTexture name="Darnell pose right0009" x="2140" y="965" width="423" height="468"/>
<SubTexture name="Darnell pose right0010" x="2568" y="965" width="423" height="468"/>
<SubTexture name="Darnell pose right0011" x="2568" y="965" width="423" height="468"/>
<SubTexture name="Darnell pose right0012" x="1284" y="965" width="423" height="468"/>
<SubTexture name="Darnell pose right0013" x="1284" y="965" width="423" height="468"/>
<SubTexture name="Darnell pose up0000" x="2996" y="965" width="380" height="552" pivotX="30.4" pivotY="20.3"/>
<SubTexture name="Darnell pose up0001" x="3381" y="965" width="380" height="552"/>
<SubTexture name="Darnell pose up0002" x="0" y="1522" width="380" height="552"/>
<SubTexture name="Darnell pose up0003" x="385" y="1522" width="380" height="552"/>
<SubTexture name="Darnell pose up0004" x="770" y="1522" width="380" height="552"/>
<SubTexture name="Darnell pose up0005" x="1155" y="1522" width="380" height="552"/>
<SubTexture name="Darnell pose up0006" x="1540" y="1522" width="380" height="552"/>
<SubTexture name="Darnell pose up0007" x="1925" y="1522" width="380" height="552"/>
<SubTexture name="Darnell pose up0008" x="2310" y="1522" width="380" height="552"/>
<SubTexture name="Darnell pose up0009" x="2310" y="1522" width="380" height="552"/>
<SubTexture name="Darnell pose up0010" x="2695" y="1522" width="380" height="552"/>
<SubTexture name="Darnell pose up0011" x="2695" y="1522" width="380" height="552"/>
<SubTexture name="Darnell pose up0012" x="3080" y="1522" width="380" height="552"/>
<SubTexture name="Darnell pose up0013" x="3080" y="1522" width="380" height="552"/>
<SubTexture name="Darnell pose up0014" x="1925" y="1522" width="380" height="552"/>
<SubTexture name="Darnell pose up0015" x="1925" y="1522" width="380" height="552"/>
<SubTexture name="darnell laugh0000" x="3465" y="1522" width="389" height="487" pivotX="2.75" pivotY="0"/>
<SubTexture name="darnell laugh0001" x="3465" y="1522" width="389" height="487"/>
<SubTexture name="darnell laugh0002" x="0" y="2079" width="389" height="487"/>
<SubTexture name="darnell laugh0003" x="394" y="2079" width="389" height="487"/>
<SubTexture name="darnell laugh0004" x="788" y="2079" width="389" height="487"/>
<SubTexture name="darnell laugh0005" x="1182" y="2079" width="389" height="487"/>
<SubTexture name="darnell pose left0000" x="1576" y="2079" width="445" height="490" pivotX="18.45" pivotY="3.35"/>
<SubTexture name="darnell pose left0001" x="2026" y="2079" width="445" height="490"/>
<SubTexture name="darnell pose left0002" x="2476" y="2079" width="445" height="490"/>
<SubTexture name="darnell pose left0003" x="2926" y="2079" width="445" height="490"/>
<SubTexture name="darnell pose left0004" x="3376" y="2079" width="445" height="490"/>
<SubTexture name="darnell pose left0005" x="0" y="2574" width="445" height="490"/>
<SubTexture name="darnell pose left0006" x="450" y="2574" width="445" height="490"/>
<SubTexture name="darnell pose left0007" x="450" y="2574" width="445" height="490"/>
<SubTexture name="darnell pose left0008" x="900" y="2574" width="445" height="490"/>
<SubTexture name="darnell pose left0009" x="900" y="2574" width="445" height="490"/>
<SubTexture name="darnell pose left0010" x="1350" y="2574" width="445" height="490"/>
<SubTexture name="darnell pose left0011" x="1350" y="2574" width="445" height="490"/>
<SubTexture name="darnell pose left0012" x="0" y="2574" width="445" height="490"/>
<SubTexture name="darnell pose left0013" x="0" y="2574" width="445" height="490"/>
<SubTexture name="darnell pose left0014" x="450" y="2574" width="445" height="490"/>
</TextureAtlas>
66 changes: 33 additions & 33 deletions assets/shared/images/characters/jsons/darnell.json
View file
Original file line number Diff line number Diff line change
@@ -1,79 +1,79 @@
{
"animations": [
{
"loop": false,
"offsets": [
0,
0
],
"loop": false,
"fps": 24,
"anim": "idle",
"indices": [],
"name": "Darnell Idle",
"fps": 24,
"playerOffsets": [
0,
0
]
],
"name": "Darnell Idle",
"indices": []
},
{
"loop": false,
"offsets": [
-36,
74
23,
71
],
"loop": false,
"fps": 24,
"anim": "singUP",
"indices": [],
"name": "Darnell pose up",
"fps": 24,
"playerOffsets": [
-36,
74
]
],
"name": "Darnell pose up",
"indices": []
},
{
"loop": false,
"offsets": [
20,
-50
14,
-47
],
"loop": false,
"fps": 24,
"anim": "singDOWN",
"indices": [],
"name": "Darnell Pose Down",
"fps": 24,
"playerOffsets": [
20,
-50
]
],
"name": "Darnell Pose Down",
"indices": []
},
{
"loop": false,
"offsets": [
31,
3
44,
-18
],
"loop": false,
"fps": 24,
"anim": "singLEFT",
"indices": [],
"name": "Darnell pose right",
"fps": 24,
"playerOffsets": [
31,
3
]
],
"name": "Darnell pose right",
"indices": []
},
{
"loop": false,
"offsets": [
-17,
-20
17,
4
],
"loop": false,
"fps": 24,
"anim": "singRIGHT",
"indices": [],
"name": "darnell pose left",
"fps": 24,
"playerOffsets": [
-17,
-20
]
],
"name": "darnell pose left",
"indices": []
}
],
"no_antialiasing": false,
Expand Down
Binary file removed assets/shared/images/notes/normal.png
View file
Binary file not shown.
92 changes: 0 additions & 92 deletions assets/shared/images/notes/normal.xml
View file

This file was deleted.

1 change: 1 addition & 0 deletions source/backend/Paths.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,7 @@ class Paths
{
if(FileSystem.exists(pathsToCheck[i]) || Assets.exists(pathsToCheck[i])) {
path = pathsToCheck[i];
break;
}
}

Expand Down
2 changes: 1 addition & 1 deletion source/objects/Character.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ class Character extends FunkinSprite

var rawJson:Dynamic;

(FileSystem.exists(path) ? rawJson = File.getContent(path) : rawJson = Assets.getText(path));
rawJson = (FileSystem.exists(path) ? File.getContent(path) : Assets.getText(path));

var json:CharacterFile = cast Json.parse(rawJson);

Expand Down
Loading

0 comments on commit a20b087

Please sign in to comment.