diff --git a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml index a2e616ea0..ca93219f4 100644 --- a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml +++ b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml @@ -127,9 +127,10 @@ function get_complex_set(set = eARMOUR_SET.MK7){ mouth_variants : spr_mk7_mouth_variants, thorax_variants : spr_mk7_thorax_variants, chest_variants : spr_mk7_chest_variants, - leg_variants : spr_mk7_leg_variants, + leg_variants : spr_mk7_leg_variants, + gorget : spr_mk8_gorget, }); - add_to_area : spr_mk8_chest + set_pieces.add_to_area("chest_variants", spr_mk8_chest); }else if (set == eARMOUR_SET.Indomitus){ set_pieces.add_group({ armour : spr_indomitus_complex, diff --git a/sprites/spr_mk8_chest/b18dfcbc-b847-441b-9b0c-618cd25c2349.png b/sprites/spr_mk8_chest/b18dfcbc-b847-441b-9b0c-618cd25c2349.png index 640784673..d4b0394f9 100644 Binary files a/sprites/spr_mk8_chest/b18dfcbc-b847-441b-9b0c-618cd25c2349.png and b/sprites/spr_mk8_chest/b18dfcbc-b847-441b-9b0c-618cd25c2349.png differ diff --git a/sprites/spr_mk8_chest/layers/b18dfcbc-b847-441b-9b0c-618cd25c2349/64129718-8943-408e-8011-70f160526bff.png b/sprites/spr_mk8_chest/layers/b18dfcbc-b847-441b-9b0c-618cd25c2349/64129718-8943-408e-8011-70f160526bff.png index bdd86a3e3..d4b0394f9 100644 Binary files a/sprites/spr_mk8_chest/layers/b18dfcbc-b847-441b-9b0c-618cd25c2349/64129718-8943-408e-8011-70f160526bff.png and b/sprites/spr_mk8_chest/layers/b18dfcbc-b847-441b-9b0c-618cd25c2349/64129718-8943-408e-8011-70f160526bff.png differ diff --git a/sprites/spr_mk8_chest/spr_mk8_chest.yy b/sprites/spr_mk8_chest/spr_mk8_chest.yy index f8f729496..46b87f077 100644 --- a/sprites/spr_mk8_chest/spr_mk8_chest.yy +++ b/sprites/spr_mk8_chest/spr_mk8_chest.yy @@ -2,10 +2,10 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_mk8_chest", - "bbox_bottom": 220, - "bbox_left": 10, - "bbox_right": 153, - "bbox_top": 12, + "bbox_bottom": 209, + "bbox_left": 48, + "bbox_right": 143, + "bbox_top": 39, "bboxMode": 0, "collisionKind": 1, "collisionTolerance": 0, diff --git a/sprites/spr_mk8_gorget/4898c548-a0c7-4e41-a1b5-a09ace2df4a7.png b/sprites/spr_mk8_gorget/4898c548-a0c7-4e41-a1b5-a09ace2df4a7.png index 6ecc23f80..d48eca67b 100644 Binary files a/sprites/spr_mk8_gorget/4898c548-a0c7-4e41-a1b5-a09ace2df4a7.png and b/sprites/spr_mk8_gorget/4898c548-a0c7-4e41-a1b5-a09ace2df4a7.png differ diff --git a/sprites/spr_mk8_gorget/6988a4aa-1960-49dd-a4d3-166e6ff7c4df.png b/sprites/spr_mk8_gorget/6988a4aa-1960-49dd-a4d3-166e6ff7c4df.png new file mode 100644 index 000000000..4d1dc84eb Binary files /dev/null and b/sprites/spr_mk8_gorget/6988a4aa-1960-49dd-a4d3-166e6ff7c4df.png differ diff --git a/sprites/spr_mk8_gorget/851a2104-903f-436b-b68b-06b80d754bf4.png b/sprites/spr_mk8_gorget/851a2104-903f-436b-b68b-06b80d754bf4.png new file mode 100644 index 000000000..a49d87349 Binary files /dev/null and b/sprites/spr_mk8_gorget/851a2104-903f-436b-b68b-06b80d754bf4.png differ diff --git a/sprites/spr_mk8_gorget/b18dfcbc-b847-441b-9b0c-618cd25c2349.png b/sprites/spr_mk8_gorget/b18dfcbc-b847-441b-9b0c-618cd25c2349.png index 6ecc23f80..f5b0c7d81 100644 Binary files a/sprites/spr_mk8_gorget/b18dfcbc-b847-441b-9b0c-618cd25c2349.png and b/sprites/spr_mk8_gorget/b18dfcbc-b847-441b-9b0c-618cd25c2349.png differ diff --git a/sprites/spr_mk8_gorget/layers/4898c548-a0c7-4e41-a1b5-a09ace2df4a7/64129718-8943-408e-8011-70f160526bff.png b/sprites/spr_mk8_gorget/layers/4898c548-a0c7-4e41-a1b5-a09ace2df4a7/64129718-8943-408e-8011-70f160526bff.png index 6ecc23f80..d48eca67b 100644 Binary files a/sprites/spr_mk8_gorget/layers/4898c548-a0c7-4e41-a1b5-a09ace2df4a7/64129718-8943-408e-8011-70f160526bff.png and b/sprites/spr_mk8_gorget/layers/4898c548-a0c7-4e41-a1b5-a09ace2df4a7/64129718-8943-408e-8011-70f160526bff.png differ diff --git a/sprites/spr_mk8_gorget/layers/6988a4aa-1960-49dd-a4d3-166e6ff7c4df/64129718-8943-408e-8011-70f160526bff.png b/sprites/spr_mk8_gorget/layers/6988a4aa-1960-49dd-a4d3-166e6ff7c4df/64129718-8943-408e-8011-70f160526bff.png new file mode 100644 index 000000000..4d1dc84eb Binary files /dev/null and b/sprites/spr_mk8_gorget/layers/6988a4aa-1960-49dd-a4d3-166e6ff7c4df/64129718-8943-408e-8011-70f160526bff.png differ diff --git a/sprites/spr_mk8_gorget/layers/851a2104-903f-436b-b68b-06b80d754bf4/64129718-8943-408e-8011-70f160526bff.png b/sprites/spr_mk8_gorget/layers/851a2104-903f-436b-b68b-06b80d754bf4/64129718-8943-408e-8011-70f160526bff.png new file mode 100644 index 000000000..a49d87349 Binary files /dev/null and b/sprites/spr_mk8_gorget/layers/851a2104-903f-436b-b68b-06b80d754bf4/64129718-8943-408e-8011-70f160526bff.png differ diff --git a/sprites/spr_mk8_gorget/layers/b18dfcbc-b847-441b-9b0c-618cd25c2349/64129718-8943-408e-8011-70f160526bff.png b/sprites/spr_mk8_gorget/layers/b18dfcbc-b847-441b-9b0c-618cd25c2349/64129718-8943-408e-8011-70f160526bff.png index 6ecc23f80..f5b0c7d81 100644 Binary files a/sprites/spr_mk8_gorget/layers/b18dfcbc-b847-441b-9b0c-618cd25c2349/64129718-8943-408e-8011-70f160526bff.png and b/sprites/spr_mk8_gorget/layers/b18dfcbc-b847-441b-9b0c-618cd25c2349/64129718-8943-408e-8011-70f160526bff.png differ diff --git a/sprites/spr_mk8_gorget/spr_mk8_gorget.yy b/sprites/spr_mk8_gorget/spr_mk8_gorget.yy index 525e727da..fcd2a311c 100644 --- a/sprites/spr_mk8_gorget/spr_mk8_gorget.yy +++ b/sprites/spr_mk8_gorget/spr_mk8_gorget.yy @@ -2,7 +2,7 @@ "resourceType": "GMSprite", "resourceVersion": "1.0", "name": "spr_mk8_gorget", - "bbox_bottom": 51, + "bbox_bottom": 58, "bbox_left": 56, "bbox_right": 107, "bbox_top": 24, @@ -14,6 +14,8 @@ "For3D": false, "frames": [ {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"b18dfcbc-b847-441b-9b0c-618cd25c2349",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"851a2104-903f-436b-b68b-06b80d754bf4",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df",}, {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7",}, ], "gridX": 0, @@ -44,7 +46,7 @@ "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "eventStubScript": null, "eventToFunction": {}, - "length": 2.0, + "length": 4.0, "lockOrigin": false, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, @@ -56,7 +58,9 @@ "tracks": [ {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},},},"Disabled":false,"id":"383a62b7-cef5-4267-b973-3ac3aad57cca","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, - {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},},},"Disabled":false,"id":"aaaa8953-8c99-4e89-99d3-90bb371e571c","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"851a2104-903f-436b-b68b-06b80d754bf4","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},},},"Disabled":false,"id":"80b2289b-cc75-4ca5-96ca-3097105f3fd2","IsCreationKey":false,"Key":1.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},},},"Disabled":false,"id":"3419f9e2-c3bc-467e-bdf0-b5dab567d3fb","IsCreationKey":false,"Key":2.0,"Length":1.0,"Stretch":false,}, + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},},},"Disabled":false,"id":"aaaa8953-8c99-4e89-99d3-90bb371e571c","IsCreationKey":false,"Key":3.0,"Length":1.0,"Stretch":false,}, ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange": null,