From 1965eabaa31dfee64c0d7ec9ea90d2c5e3bf0d9f Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sat, 5 Jan 2019 16:53:21 +0900 Subject: [PATCH] joints in skeleton are ordered according to drawing order, PSD also updated --- src/net/torvald/terrarum/tests/ADLParsingTest.kt | 16 +++++++++++----- work_files/graphics/sprites/sprite_joints.psd | 4 ++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/net/torvald/terrarum/tests/ADLParsingTest.kt b/src/net/torvald/terrarum/tests/ADLParsingTest.kt index 376795e74..e681037fe 100644 --- a/src/net/torvald/terrarum/tests/ADLParsingTest.kt +++ b/src/net/torvald/terrarum/tests/ADLParsingTest.kt @@ -17,12 +17,18 @@ class ADLParsingTest { ! a skeleton also defines what body parts (images) be used. ! you can also write multiline text using reverse solidus; this is a feature of .properties - SKELETON_STAND=HEAD 0,32;\ + ! skeleton joints are ordered: foremost-drawn object comes first, which means lowermost object IN THIS LIST + ! are painted first, and any object that comes before it will paint over it. In other words, this list is + ! first reversed then being iterated. + ! Joints' original point is defined in the document sprite_joints.psd. It also has visual representations. + # TODO right now accessory points are explicitly defined. Should they be injected in run-time? + SKELETON_STAND=HEADGEAR 0,32;HAIR_FORE 0,32;\ + ARM_REST_RIGHT -7,23;HAND_REST_RIGHT -6,11;HELD_ITEM -6,11;\ + HAIR 0,32;HEAD 0,32;\ UPPER_TORSO 0,23;LOWER_TORSO 0,15;\ - LEG_LEFT 2,7;FOOT_LEFT 2,2;\ - LEG_RIGHT -2,7;FOOT_RIGHT -2,2;\ - ARM_REST_LEFT 5,24;HAND_REST_LEFT 6,12;\ - ARM_REST_RIGHT -7,23;HAND_REST_RIGHT -6,11 + FOOT_RIGHT -2,2;LEG_RIGHT -2,7;\ + FOOT_LEFT 2,2;LEG_LEFT 2,7;\ + ARM_REST_LEFT 5,24;HAND_REST_LEFT 6,12 # skeleton_stand is used for testing purpose ANIM_RUN=DELAY 0.15;ROW 2;SKELETON SKELETON_STAND diff --git a/work_files/graphics/sprites/sprite_joints.psd b/work_files/graphics/sprites/sprite_joints.psd index a2eb4c4f8..02913558b 100644 --- a/work_files/graphics/sprites/sprite_joints.psd +++ b/work_files/graphics/sprites/sprite_joints.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7065ec6c43d07c4585755a11215875263bb7146700d1a018c2f189c142d0a55 -size 44277 +oid sha256:e2219270b7e6225c79137b5df3157d73e0962b4ad4b16eaa6b0b611396da15d0 +size 45481