-
Notifications
You must be signed in to change notification settings - Fork 154
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #97 from bluecarrot16/weapons-fixes
Weapons fixes
- Loading branch information
Showing
151 changed files
with
606 additions
and
248 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| { | ||
| "name": "S staff", | ||
| "type_name": "weapon", | ||
| "layer_1": { | ||
| "zPos": 140, | ||
| "male": "weapon/magic/s/universal/foreground/", | ||
| "muscular": "weapon/magic/s/universal/foreground/", | ||
| "female": "weapon/magic/s/universal/foreground/", | ||
| "teen": "weapon/magic/s/universal/foreground/", | ||
| "pregnant": "weapon/magic/s/universal/foreground/" | ||
| }, | ||
| "layer_2": { | ||
| "zPos": 9, | ||
| "male": "weapon/magic/s/universal/background/", | ||
| "muscular": "weapon/magic/s/universal/background/", | ||
| "female": "weapon/magic/s/universal/background/", | ||
| "teen": "weapon/magic/s/universal/background/", | ||
| "pregnant": "weapon/magic/s/universal/background/" | ||
| }, | ||
| "layer_3": { | ||
| "custom_animation": "thrust_oversize", | ||
| "zPos": 150, | ||
| "male": "weapon/magic/s/thrust/foreground/", | ||
| "muscular": "weapon/magic/s/thrust/foreground/", | ||
| "female": "weapon/magic/s/thrust/foreground/", | ||
| "teen": "weapon/magic/s/thrust/foreground/", | ||
| "pregnant": "weapon/magic/s/thrust/foreground/" | ||
| }, | ||
| "layer_4": { | ||
| "custom_animation": "thrust_oversize", | ||
| "zPos": -1, | ||
| "male": "weapon/magic/s/thrust/background/", | ||
| "muscular": "weapon/magic/s/thrust/background/", | ||
| "female": "weapon/magic/s/thrust/background/", | ||
| "teen": "weapon/magic/s/thrust/background/", | ||
| "pregnant": "weapon/magic/s/thrust/background/" | ||
| }, | ||
| "variants": [ | ||
| "s" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "name": "Simple staff", | ||
| "type_name": "weapon", | ||
| "layer_1": { | ||
| "zPos": 140, | ||
| "male": "weapon/magic/simple/foreground/", | ||
| "muscular": "weapon/magic/simple/foreground/", | ||
| "female": "weapon/magic/simple/foreground/", | ||
| "teen": "weapon/magic/simple/foreground/", | ||
| "pregnant": "weapon/magic/simple/foreground/" | ||
| }, | ||
| "layer_2": { | ||
| "zPos": 9, | ||
| "male": "weapon/magic/simple/background/", | ||
| "muscular": "weapon/magic/simple/background/", | ||
| "female": "weapon/magic/simple/background/", | ||
| "teen": "weapon/magic/simple/background/", | ||
| "pregnant": "weapon/magic/simple/background/" | ||
| }, | ||
| "variants": [ | ||
| "simple" | ||
| ] | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| { | ||
| "name": "Dragon spear", | ||
| "type_name": "weapon", | ||
| "layer_1": { | ||
| "zPos": 140, | ||
| "custom_animation": "walk_128", | ||
| "male": "weapon/polearm/dragonspear/walk/foreground/", | ||
| "muscular": "weapon/polearm/dragonspear/walk/foreground/", | ||
| "female": "weapon/polearm/dragonspear/walk/foreground/", | ||
| "teen": "weapon/polearm/dragonspear/walk/foreground/", | ||
| "pregnant": "weapon/polearm/dragonspear/walk/foreground/" | ||
| }, | ||
| "layer_2": { | ||
| "zPos": 9, | ||
| "custom_animation": "walk_128", | ||
| "male": "weapon/polearm/dragonspear/walk/background/", | ||
| "muscular": "weapon/polearm/dragonspear/walk/background/", | ||
| "female": "weapon/polearm/dragonspear/walk/background/", | ||
| "teen": "weapon/polearm/dragonspear/walk/background/", | ||
| "pregnant": "weapon/polearm/dragonspear/walk/background/" | ||
| }, | ||
| "layer_3": { | ||
| "custom_animation": "thrust_oversize", | ||
| "zPos": 150, | ||
| "male": "weapon/polearm/dragonspear/thrust/foreground/", | ||
| "muscular": "weapon/polearm/dragonspear/thrust/foreground/", | ||
| "female": "weapon/polearm/dragonspear/thrust/foreground/", | ||
| "teen": "weapon/polearm/dragonspear/thrust/foreground/", | ||
| "pregnant": "weapon/polearm/dragonspear/thrust/foreground/" | ||
| }, | ||
| "layer_4": { | ||
| "custom_animation": "thrust_oversize", | ||
| "zPos": -1, | ||
| "male": "weapon/polearm/dragonspear/thrust/background/", | ||
| "muscular": "weapon/polearm/dragonspear/thrust/background/", | ||
| "female": "weapon/polearm/dragonspear/thrust/background/", | ||
| "teen": "weapon/polearm/dragonspear/thrust/background/", | ||
| "pregnant": "weapon/polearm/dragonspear/thrust/background/" | ||
| }, | ||
| "variants": [ | ||
| "dragonspear" | ||
| ] | ||
| } |
Oops, something went wrong.