Skip to content

Commit

Permalink
Separate hats, face hair, glasses from hair (fixes #601)
Browse files Browse the repository at this point in the history
  • Loading branch information
cxong committed Jul 6, 2023
1 parent b54bd4b commit 2d05b80
Show file tree
Hide file tree
Showing 77 changed files with 2,118 additions and 1,073 deletions.
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
{
"Version": 2,
"Order": [
["gun_r", "gun_l", "legs", "head", "body", "hair"],
["gun_r", "gun_l", "legs", "head", "body", "hair"],
["gun_l", "legs", "body", "head", "hair", "gun_r"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "gun_r", "body", "head", "hair", "gun_l"],
["gun_r", "gun_l", "legs", "head", "body", "hair"]
["gun_r", "gun_l", "legs", "head", "body"],
["gun_r", "gun_l", "legs", "head", "body"],
["gun_l", "legs", "body", "head", "gun_r"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "gun_r", "body", "head", "gun_l"],
["gun_r", "gun_l", "legs", "head", "body"]
],
"Offsets": {
"Frame": {
"Hair": {
"stand": [[0, 10]],
"idle": [[0, 10]],
"run": [
[0, 11], [0, 10], [0, 9], [0, 10], [0, 11], [0, 10], [0, 9], [0, 10]
]
},
"Head": {
"stand": [[0, 10]],
"idle": [[0, 10]],
Expand All @@ -41,9 +34,6 @@
}
},
"Dir": {
"Hair": [
[0, -2], [2, -1], [4, 0], [2, 1], [0, 2], [-2, 1], [-4, 0], [-2, -1]
],
"Head": [
[0, -2], [2, -1], [4, 0], [2, 1], [0, 2], [-2, 1], [-4, 0], [-2, -1]
],
Expand Down
23 changes: 8 additions & 15 deletions data/.wolf3d/SD2data.cdogscpn/graphics/chars/bodies/bat/data.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
{
"Version": 2,
"Order": [
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "gun_r", "gun_l", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"]
["gun_r", "gun_l", "legs", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "gun_r", "gun_l", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"]
],
"Offsets": {
"Frame": {
"Hair": {
"stand": [[0, 13]],
"idle": [[0, 13]],
"run": [
[0, 14], [0, 14], [0, 13], [0, 13], [0, 12], [0, 12], [0, 13], [0, 13]
]
},
"Head": {
"stand": [[0, 13]],
"idle": [[0, 13]],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
{
"Version": 2,
"Order": [
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "gun_r", "gun_l", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"]
["gun_r", "gun_l", "legs", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "gun_r", "gun_l", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"]
],
"Offsets": {
"Frame": {
"Hair": {
"stand": [[0, 16]],
"idle": [[0, 16]],
"run": [
[0, 17], [0, 16], [0, 15], [0, 16], [0, 17], [0, 16], [0, 15], [0, 16]
]
},
"Head": {
"stand": [[0, 16]],
"idle": [[0, 16]],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
{
"Version": 2,
"Order": [
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "gun_r", "gun_l", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"]
["gun_r", "gun_l", "legs", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "gun_r", "gun_l", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"]
],
"Offsets": {
"Frame": {
"Hair": {
"stand": [[0, 13]],
"idle": [[0, 13]],
"run": [
[0, 13], [0, 13], [0, 13], [0, 13], [0, 13], [0, 13], [0, 13], [0, 13]
]
},
"Head": {
"stand": [[0, 13]],
"idle": [[0, 13]],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
{
"Version": 2,
"Order": [
["gun_r", "gun_l", "legs", "head", "body", "hair"],
["gun_r", "gun_l", "legs", "head", "body", "hair"],
["gun_l", "legs", "body", "head", "hair", "gun_r"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "gun_r", "body", "head", "hair", "gun_l"],
["gun_r", "gun_l", "legs", "head", "body", "hair"]
["gun_r", "gun_l", "legs", "head", "body"],
["gun_r", "gun_l", "legs", "head", "body"],
["gun_l", "legs", "body", "head", "gun_r"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "gun_r", "body", "head", "gun_l"],
["gun_r", "gun_l", "legs", "head", "body"]
],
"Offsets": {
"Frame": {
"Hair": {
"stand": [[0, 10]],
"idle": [[0, 10]],
"run": [
[0, 11], [0, 10], [0, 9], [0, 10], [0, 11], [0, 10], [0, 9], [0, 10]
]
},
"Head": {
"stand": [[0, 10]],
"idle": [[0, 10]],
Expand All @@ -41,9 +34,6 @@
}
},
"Dir": {
"Hair": [
[0, -2], [2, -1], [4, 0], [2, 1], [0, 2], [-2, 1], [-4, 0], [-2, -1]
],
"Head": [
[0, -2], [2, -1], [4, 0], [2, 1], [0, 2], [-2, 1], [-4, 0], [-2, -1]
],
Expand Down
23 changes: 8 additions & 15 deletions data/.wolf3d/SD3data.cdogscpn/graphics/chars/bodies/bat/data.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
{
"Version": 2,
"Order": [
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "gun_r", "gun_l", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"]
["gun_r", "gun_l", "legs", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "gun_r", "gun_l", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"]
],
"Offsets": {
"Frame": {
"Hair": {
"stand": [[0, 13]],
"idle": [[0, 13]],
"run": [
[0, 14], [0, 14], [0, 13], [0, 13], [0, 12], [0, 12], [0, 13], [0, 13]
]
},
"Head": {
"stand": [[0, 13]],
"idle": [[0, 13]],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
{
"Version": 2,
"Order": [
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "gun_r", "gun_l", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"]
["gun_r", "gun_l", "legs", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "gun_r", "gun_l", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"]
],
"Offsets": {
"Frame": {
"Hair": {
"stand": [[0, 16]],
"idle": [[0, 16]],
"run": [
[0, 17], [0, 16], [0, 15], [0, 16], [0, 17], [0, 16], [0, 15], [0, 16]
]
},
"Head": {
"stand": [[0, 16]],
"idle": [[0, 16]],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
{
"Version": 2,
"Order": [
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "gun_r", "gun_l", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"]
["gun_r", "gun_l", "legs", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "gun_r", "gun_l", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"]
],
"Offsets": {
"Frame": {
"Hair": {
"stand": [[0, 13]],
"idle": [[0, 13]],
"run": [
[0, 13], [0, 13], [0, 13], [0, 13], [0, 13], [0, 13], [0, 13], [0, 13]
]
},
"Head": {
"stand": [[0, 13]],
"idle": [[0, 13]],
Expand Down
26 changes: 8 additions & 18 deletions data/.wolf3d/common.cdogscpn/graphics/chars/bodies/angel/data.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
{
"Version": 2,
"Order": [
["gun_r", "gun_l", "legs", "head", "body", "hair"],
["gun_r", "gun_l", "legs", "head", "body", "hair"],
["gun_l", "legs", "body", "head", "hair", "gun_r"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "gun_r", "body", "head", "hair", "gun_l"],
["gun_r", "gun_l", "legs", "head", "body", "hair"]
["gun_r", "gun_l", "legs", "head", "body"],
["gun_r", "gun_l", "legs", "head", "body"],
["gun_l", "legs", "body", "head", "gun_r"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "gun_r", "body", "head", "gun_l"],
["gun_r", "gun_l", "legs", "head", "body"]
],
"Offsets": {
"Frame": {
"Hair": {
"stand": [[0, 10]],
"idle": [[0, 10]],
"run": [
[0, 11], [0, 10], [0, 9], [0, 10], [0, 11], [0, 10], [0, 9], [0, 10]
]
},
"Head": {
"stand": [[0, 10]],
"idle": [[0, 10]],
Expand All @@ -41,9 +34,6 @@
}
},
"Dir": {
"Hair": [
[0, -2], [2, -1], [4, 0], [2, 1], [0, 2], [-2, 1], [-4, 0], [-2, -1]
],
"Head": [
[0, -2], [2, -1], [4, 0], [2, 1], [0, 2], [-2, 1], [-4, 0], [-2, -1]
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
{
"Version": 2,
"Order": [
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "gun_r", "gun_l", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"]
["gun_r", "gun_l", "legs", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "gun_r", "gun_l", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"]
],
"Offsets": {
"Frame": {
"Hair": {
"stand": [[0, 16]],
"idle": [[0, 16]],
"run": [
[0, 17], [0, 16], [0, 15], [0, 16], [0, 17], [0, 16], [0, 15], [0, 16]
]
},
"Head": {
"stand": [[0, 16]],
"idle": [[0, 16]],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
{
"Version": 2,
"Order": [
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "body", "head", "hair", "gun_r", "gun_l"],
["legs", "gun_r", "gun_l", "body", "head", "hair"],
["gun_r", "gun_l", "legs", "body", "head", "hair"]
["gun_r", "gun_l", "legs", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "body", "head", "gun_r", "gun_l"],
["legs", "gun_r", "gun_l", "body", "head"],
["gun_r", "gun_l", "legs", "body", "head"]
],
"Offsets": {
"Frame": {
"Hair": {
"stand": [[0, 13]],
"idle": [[0, 13]],
"run": [
[0, 14], [0, 13], [0, 12], [0, 13], [0, 14], [0, 13], [0, 12], [0, 13]
]
},
"Head": {
"stand": [[0, 13]],
"idle": [[0, 13]],
Expand Down
Loading

0 comments on commit 2d05b80

Please sign in to comment.