diff --git a/assets/Data/entity/creatures/human.json b/assets/Data/entity/creatures/human.json index 71426230..0787eeb7 100644 --- a/assets/Data/entity/creatures/human.json +++ b/assets/Data/entity/creatures/human.json @@ -443,13 +443,13 @@ ] }, { - "attackMoveId" : "Sword1HSlash1", + "attackMoveId" : "SwordRHSlash1", "type" : "MELEE_WEAPON_SWING_ONE_HAND", "windupFrames" : 5, "attackFrames" : 5, "cooldownFrames" : 25, "firesProjectile" : false, - "nextMoveId" : "Sword1HSlash2", + "nextMoveId" : "SwordRHSlash2", "nextAttackMoveWindowStart" : 0, "nextAttackMoveWindowEnd" : 1, "moveChainWindowStart" : 12, @@ -458,61 +458,35 @@ "driftFrameStart" : 7, "driftFrameEnd" : 15, "initialMove" : true, - "windupState" : { - "animation" : { - "nameFirstPerson" : "Sword1HSlash1", - "nameThirdPerson" : "Sword1HSlash1", - "priorityCategory" : "MOVEMENT_MODIFIER" - } - }, - "holdState" : { - "animation" : { - "nameFirstPerson" : "Sword1HSlash1", - "nameThirdPerson" : "Sword1HSlash1", - "priorityCategory" : "MOVEMENT_MODIFIER" - } - }, "attackState" : { "animation" : { - "nameFirstPerson" : "Sword1HSlash1", - "nameThirdPerson" : "Sword1HSlash1", - "priorityCategory" : "MOVEMENT_MODIFIER" + "nameFirstPerson" : "SwordRHSlash1", + "nameThirdPerson" : "SwordRHSlash1", + "priorityCategory" : "MOVEMENT_MODIFIER", + "boneGroups" : ["armRight", "handRight"] } } }, { - "attackMoveId" : "Sword1HSlash2", + "attackMoveId" : "SwordRHSlash2", "type" : "MELEE_WEAPON_SWING_ONE_HAND", "windupFrames" : 2, "attackFrames" : 5, "cooldownFrames" : 28, "firesProjectile" : false, - "nextMoveId" : "Sword1HSlash1", + "nextMoveId" : "SwordRHSlash1", "nextAttackMoveWindowStart" : 10, "nextAttackMoveWindowEnd" : 18, "driftGoal" : 0.03, "driftFrameStart" : 1, "driftFrameEnd" : 10, "initialMove" : false, - "windupState" : { - "animation" : { - "nameFirstPerson" : "Jump", - "nameThirdPerson" : "Jump", - "priorityCategory" : "MOVEMENT_MODIFIER" - } - }, - "holdState" : { - "animation" : { - "nameFirstPerson" : "Jump", - "nameThirdPerson" : "Jump", - "priorityCategory" : "MOVEMENT_MODIFIER" - } - }, "attackState" : { "animation" : { - "nameFirstPerson" : "Sword1HSlash2", - "nameThirdPerson" : "Sword1HSlash2", - "priorityCategory" : "MOVEMENT_MODIFIER" + "nameFirstPerson" : "SwordRHSlash2", + "nameThirdPerson" : "SwordRHSlash2", + "priorityCategory" : "MOVEMENT_MODIFIER", + "boneGroups" : ["armRight", "handRight"] } } }, diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index d31e733e..e62f3bfb 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1449,6 +1449,7 @@ Static rocks which harvest into rock items that spawn in forest (04/05/2025) Stone Axe item +Fix human data for RH sword slash attack moves