diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 4c643de624..c983780a72 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -966,6 +966,7 @@ {"id":{"name":"helm_shader","path":"shaders/helm_shader/helm_shader.yy",},}, {"id":{"name":"light_dark_shader","path":"shaders/light_dark_shader/light_dark_shader.yy",},}, {"id":{"name":"reverse_draw_shader","path":"shaders/reverse_draw_shader/reverse_draw_shader.yy",},}, + {"id":{"name":"right_left_swap_shader","path":"shaders/right_left_swap_shader/right_left_swap_shader.yy",},}, {"id":{"name":"shd_multiply_blend","path":"shaders/shd_multiply_blend/shd_multiply_blend.yy",},}, {"id":{"name":"Ship_shader","path":"shaders/Ship_shader/Ship_shader.yy",},}, {"id":{"name":"skin_tone_shader","path":"shaders/skin_tone_shader/skin_tone_shader.yy",},}, @@ -1375,6 +1376,7 @@ {"id":{"name":"spr_mk3_mouth_flame_cult","path":"sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy",},}, {"id":{"name":"spr_mk3_mouth_prussian","path":"sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy",},}, {"id":{"name":"spr_mk3_mouth","path":"sprites/spr_mk3_mouth/spr_mk3_mouth.yy",},}, + {"id":{"name":"spr_mk3_right_arm_shadow","path":"sprites/spr_mk3_right_arm_shadow/spr_mk3_right_arm_shadow.yy",},}, {"id":{"name":"spr_mk3_right_arm","path":"sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy",},}, {"id":{"name":"spr_mk3_right_knee","path":"sprites/spr_mk3_right_knee/spr_mk3_right_knee.yy",},}, {"id":{"name":"spr_mk3_right_trim","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},}, @@ -1391,6 +1393,7 @@ {"id":{"name":"spr_mk4_mongol_chest_variants","path":"sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy",},}, {"id":{"name":"spr_mk4_mongol_hat","path":"sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy",},}, {"id":{"name":"spr_mk4_mouth_variants","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},}, + {"id":{"name":"spr_mk4_right_arm_shadow","path":"sprites/spr_mk4_right_arm_shadow/spr_mk4_right_arm_shadow.yy",},}, {"id":{"name":"spr_mk4_right_arm","path":"sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy",},}, {"id":{"name":"spr_mk4_right_trim","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},}, {"id":{"name":"spr_mk5_chest_variants","path":"sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy",},}, @@ -1399,6 +1402,7 @@ {"id":{"name":"spr_mk5_complex","path":"sprites/spr_mk5_complex/spr_mk5_complex.yy",},}, {"id":{"name":"spr_mk5_head_variants","path":"sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy",},}, {"id":{"name":"spr_mk5_left_arm","path":"sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy",},}, + {"id":{"name":"spr_mk5_right_arm_shadow","path":"sprites/spr_mk5_right_arm_shadow/spr_mk5_right_arm_shadow.yy",},}, {"id":{"name":"spr_mk5_right_arm","path":"sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy",},}, {"id":{"name":"spr_mk5_samuri_faceplate","path":"sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy",},}, {"id":{"name":"spr_mk6_complex_backpack","path":"sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy",},}, @@ -1421,8 +1425,6 @@ {"id":{"name":"spr_mk7_complex_crux_belt","path":"sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy",},}, {"id":{"name":"spr_mk7_complex_knees","path":"sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy",},}, {"id":{"name":"spr_mk7_complex_left_knee_1","path":"sprites/spr_mk7_complex_left_knee_1/spr_mk7_complex_left_knee_1.yy",},}, - {"id":{"name":"spr_mk7_complex_left_pauldron_shadow","path":"sprites/spr_mk7_complex_left_pauldron_shadow/spr_mk7_complex_left_pauldron_shadow.yy",},}, - {"id":{"name":"spr_mk7_complex_left_pauldron","path":"sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy",},}, {"id":{"name":"spr_mk7_complex_right_knee","path":"sprites/spr_mk7_complex_right_knee/spr_mk7_complex_right_knee.yy",},}, {"id":{"name":"spr_mk7_complex_right_pauldron_shadow","path":"sprites/spr_mk7_complex_right_pauldron_shadow/spr_mk7_complex_right_pauldron_shadow.yy",},}, {"id":{"name":"spr_mk7_complex_right_pauldron","path":"sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy",},}, @@ -1439,6 +1441,7 @@ {"id":{"name":"spr_mk7_mouth_prussian","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},}, {"id":{"name":"spr_mk7_mouth_variants","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},}, {"id":{"name":"spr_mk7_prussia_chest","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},}, + {"id":{"name":"spr_mk7_right_arm_shadow","path":"sprites/spr_mk7_right_arm_shadow/spr_mk7_right_arm_shadow.yy",},}, {"id":{"name":"spr_mk7_right_arm","path":"sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy",},}, {"id":{"name":"spr_mk7_right_trim","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},}, {"id":{"name":"spr_mk7_rope_belt","path":"sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy",},}, diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index ec83dfa0ce..526e2870f5 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -100,8 +100,6 @@ function ComplexSet(_unit) constructor { //draw_helms = false; static mk7_bits = { armour: spr_mk7_complex, - left_arm: spr_mk7_left_arm, - right_arm: spr_mk7_right_arm, left_trim: spr_mk7_left_trim, right_trim: spr_mk7_right_trim, mouth_variants: spr_mk7_mouth_variants, @@ -1280,8 +1278,6 @@ function ComplexSet(_unit) constructor { add_group({ armour: spr_mk6_complex, backpack: spr_mk6_complex_backpack, - left_arm: spr_mk6_left_arm, - right_arm: spr_mk6_right_arm, left_trim: spr_mk7_left_trim, right_trim: spr_mk7_right_trim, mouth_variants: spr_mk6_mouth_variants, @@ -1293,8 +1289,6 @@ function ComplexSet(_unit) constructor { add_group({ armour: spr_mk5_complex, backpack: spr_mk5_complex_backpack, - left_arm: spr_mk5_left_arm, - right_arm: spr_mk5_right_arm, left_trim: spr_mk7_left_trim, right_trim: spr_mk7_right_trim, head: spr_mk5_head_variants, @@ -1311,9 +1305,7 @@ function ComplexSet(_unit) constructor { chest_variants: spr_mk4_chest_variants, armour: spr_mk4_complex, backpack: spr_mk4_complex_backpack, - left_arm: spr_mk4_left_arm, leg_variants: spr_mk4_leg_variants, - right_arm: spr_mk4_right_arm, left_trim: spr_mk4_left_trim, right_trim: spr_mk4_right_trim, mouth_variants: spr_mk4_mouth_variants, @@ -1325,8 +1317,6 @@ function ComplexSet(_unit) constructor { add_group({ armour: spr_mk3_complex, backpack: spr_mk3_complex_backpack, - left_arm: spr_mk3_left_arm, - right_arm: spr_mk3_right_arm, head: spr_mk3_head_variants, left_knee: spr_mk3_left_knee, right_knee: spr_mk3_right_knee, diff --git a/scripts/scr_controller_helpers/scr_controller_helpers.gml b/scripts/scr_controller_helpers/scr_controller_helpers.gml index 52ab253e31..de456d5257 100644 --- a/scripts/scr_controller_helpers/scr_controller_helpers.gml +++ b/scripts/scr_controller_helpers/scr_controller_helpers.gml @@ -171,6 +171,12 @@ function init_manage_buttons(){ label: "Show Bio", tooltip: "Click here or press B to Toggle Unit Biography." }), + capture_image: new UnitButtonObject({ + style: "pixel", + label: "Capture Image", + tooltip: "Click to create a local png of the given marine in the game folder." + }), + company_namer : new TextBarArea(800, 108, 600, false), }; } diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 9b15d84644..54ed91f3c9 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -193,6 +193,41 @@ function load_vis_set_to_global(directory, data) { function set_up_visual_overides(){ var _mods = global.modular_drawing_items; + static flip_components = { + "right_leg" : "left_leg", + "left_leg" : "right_leg", + + "right_shin" : "left_shin", + "left_shin" : "right_shin", + + "right_knee" : "left_knee", + "left_knee" : "right_knee", + + "right_trim" : "left_trim", + "left_trim" : "right_trim", + + "right_arm" : "left_arm", + "left_arm" : "right_arm", + + "right_pauldron_icons" : "left_pauldron_icons", + "left_pauldron_icons" : "right_pauldron_icons", + + "right_pauldron_base" : "left_pauldron_base", + "left_pauldron_base" : "right_pauldron_base", + + "right_pauldron_embeleshments" : "left_pauldron_embeleshments", + "left_pauldron_embeleshments" : "right_pauldron_embeleshments", + + "right_pauldron_hangings" : "left_pauldron_hangings", + "left_pauldron_hangings" : "right_pauldron_hangings", + + "right_eye" : "left_eye", + "left_eye" : "right_eye", + + "right_weapon" : "left_weapon", + "left_weapon" : "right_weapon", + }; + for (var i=0;i= _127_25COL && col_orig.r <= _128_75COL) { col_orig.r = _128COL; } + if (col_orig.g >= _127_25COL && col_orig.g <= _128_75COL) { col_orig.g = _128COL; } + if (col_orig.b >= _127_25COL && col_orig.b <= _128_75COL) { col_orig.b = _128COL; } + if (col_orig.a >= _127_25COL && col_orig.a <= _128_75COL) { col_orig.a = _128COL; } + + vec4 col = col_orig; + col.rgb = remapRightToLeft(col.rgb); + gl_FragColor = v_vColour * col; +} diff --git a/shaders/right_left_swap_shader/right_left_swap_shader.vsh b/shaders/right_left_swap_shader/right_left_swap_shader.vsh new file mode 100644 index 0000000000..3900c20f40 --- /dev/null +++ b/shaders/right_left_swap_shader/right_left_swap_shader.vsh @@ -0,0 +1,19 @@ +// +// Simple passthrough vertex shader +// +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; + + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; +} diff --git a/shaders/right_left_swap_shader/right_left_swap_shader.yy b/shaders/right_left_swap_shader/right_left_swap_shader.yy new file mode 100644 index 0000000000..6b47a6a1db --- /dev/null +++ b/shaders/right_left_swap_shader/right_left_swap_shader.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"right_left_swap_shader", + "name":"right_left_swap_shader", + "parent":{ + "name":"Shaders", + "path":"folders/Shaders.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/sprites/spr_mk3_right_arm_shadow/6a57f22a-0d22-44d9-9f77-fc818daa157a.png b/sprites/spr_mk3_right_arm_shadow/6a57f22a-0d22-44d9-9f77-fc818daa157a.png new file mode 100644 index 0000000000..0bcbdb1e72 Binary files /dev/null and b/sprites/spr_mk3_right_arm_shadow/6a57f22a-0d22-44d9-9f77-fc818daa157a.png differ diff --git a/sprites/spr_mk3_right_arm_shadow/layers/6a57f22a-0d22-44d9-9f77-fc818daa157a/a36cc102-af8d-4321-bd66-cbf3f0ad2435.png b/sprites/spr_mk3_right_arm_shadow/layers/6a57f22a-0d22-44d9-9f77-fc818daa157a/a36cc102-af8d-4321-bd66-cbf3f0ad2435.png new file mode 100644 index 0000000000..0bcbdb1e72 Binary files /dev/null and b/sprites/spr_mk3_right_arm_shadow/layers/6a57f22a-0d22-44d9-9f77-fc818daa157a/a36cc102-af8d-4321-bd66-cbf3f0ad2435.png differ diff --git a/sprites/spr_mk3_right_arm_shadow/spr_mk3_right_arm_shadow.yy b/sprites/spr_mk3_right_arm_shadow/spr_mk3_right_arm_shadow.yy new file mode 100644 index 0000000000..5a41e00977 --- /dev/null +++ b/sprites/spr_mk3_right_arm_shadow/spr_mk3_right_arm_shadow.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_mk3_right_arm_shadow", + "bboxMode":0, + "bbox_bottom":125, + "bbox_left":15, + "bbox_right":42, + "bbox_top":67, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"6a57f22a-0d22-44d9-9f77-fc818daa157a","name":"6a57f22a-0d22-44d9-9f77-fc818daa157a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"a36cc102-af8d-4321-bd66-cbf3f0ad2435","blendMode":0,"displayName":"default","isLocked":false,"name":"a36cc102-af8d-4321-bd66-cbf3f0ad2435","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_mk3_right_arm_shadow", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"mk_3_complex", + "path":"folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_mk3_right_arm_shadow", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_mk3_right_arm_shadow", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a57f22a-0d22-44d9-9f77-fc818daa157a","path":"sprites/spr_mk3_right_arm_shadow/spr_mk3_right_arm_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b0fbc816-005b-44a1-932d-b3f4ae5b718c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":164, +} \ No newline at end of file diff --git a/sprites/spr_mk4_complex/40cfe8bd-f11d-4d74-a157-47d58c39d7e8.png b/sprites/spr_mk4_complex/40cfe8bd-f11d-4d74-a157-47d58c39d7e8.png index 9ef4c15cf3..e66fa68383 100644 Binary files a/sprites/spr_mk4_complex/40cfe8bd-f11d-4d74-a157-47d58c39d7e8.png and b/sprites/spr_mk4_complex/40cfe8bd-f11d-4d74-a157-47d58c39d7e8.png differ diff --git a/sprites/spr_mk4_complex/layers/40cfe8bd-f11d-4d74-a157-47d58c39d7e8/e7b69ad2-206a-4f32-ade6-1a7c0f38210f.png b/sprites/spr_mk4_complex/layers/40cfe8bd-f11d-4d74-a157-47d58c39d7e8/e7b69ad2-206a-4f32-ade6-1a7c0f38210f.png index c70aabb18d..11b9d64740 100644 Binary files a/sprites/spr_mk4_complex/layers/40cfe8bd-f11d-4d74-a157-47d58c39d7e8/e7b69ad2-206a-4f32-ade6-1a7c0f38210f.png and b/sprites/spr_mk4_complex/layers/40cfe8bd-f11d-4d74-a157-47d58c39d7e8/e7b69ad2-206a-4f32-ade6-1a7c0f38210f.png differ diff --git a/sprites/spr_mk4_complex/spr_mk4_complex.yy b/sprites/spr_mk4_complex/spr_mk4_complex.yy index e948bfcb16..0bd256c69c 100644 --- a/sprites/spr_mk4_complex/spr_mk4_complex.yy +++ b/sprites/spr_mk4_complex/spr_mk4_complex.yy @@ -3,9 +3,9 @@ "%Name":"spr_mk4_complex", "bboxMode":0, "bbox_bottom":220, - "bbox_left":11, - "bbox_right":152, - "bbox_top":28, + "bbox_left":12, + "bbox_right":151, + "bbox_top":31, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, diff --git a/sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy b/sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy index bb56afac64..00d995fe64 100644 --- a/sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy +++ b/sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","path":"sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b9e1ad2f-89b1-4000-9111-d63df121427d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","path":"sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b9e1ad2f-89b1-4000-9111-d63df121427d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_right_arm_shadow/3d13dae2-7b70-44aa-8549-cbb2c2dbc424.png b/sprites/spr_mk4_right_arm_shadow/3d13dae2-7b70-44aa-8549-cbb2c2dbc424.png new file mode 100644 index 0000000000..a519247762 Binary files /dev/null and b/sprites/spr_mk4_right_arm_shadow/3d13dae2-7b70-44aa-8549-cbb2c2dbc424.png differ diff --git a/sprites/spr_mk4_right_arm_shadow/layers/3d13dae2-7b70-44aa-8549-cbb2c2dbc424/15ec2c68-c987-495a-ad96-2f90a4749ca3.png b/sprites/spr_mk4_right_arm_shadow/layers/3d13dae2-7b70-44aa-8549-cbb2c2dbc424/15ec2c68-c987-495a-ad96-2f90a4749ca3.png new file mode 100644 index 0000000000..a519247762 Binary files /dev/null and b/sprites/spr_mk4_right_arm_shadow/layers/3d13dae2-7b70-44aa-8549-cbb2c2dbc424/15ec2c68-c987-495a-ad96-2f90a4749ca3.png differ diff --git a/sprites/spr_mk7_complex_left_pauldron_shadow/spr_mk7_complex_left_pauldron_shadow.yy b/sprites/spr_mk4_right_arm_shadow/spr_mk4_right_arm_shadow.yy similarity index 57% rename from sprites/spr_mk7_complex_left_pauldron_shadow/spr_mk7_complex_left_pauldron_shadow.yy rename to sprites/spr_mk4_right_arm_shadow/spr_mk4_right_arm_shadow.yy index f94af43cf3..2a9c3ae82a 100644 --- a/sprites/spr_mk7_complex_left_pauldron_shadow/spr_mk7_complex_left_pauldron_shadow.yy +++ b/sprites/spr_mk4_right_arm_shadow/spr_mk4_right_arm_shadow.yy @@ -1,59 +1,39 @@ { "$GMSprite":"v2", - "%Name":"spr_mk7_complex_left_pauldron_shadow", + "%Name":"spr_mk4_right_arm_shadow", "bboxMode":0, - "bbox_bottom":81, - "bbox_left":105, - "bbox_right":152, - "bbox_top":28, + "bbox_bottom":125, + "bbox_left":13, + "bbox_right":45, + "bbox_top":66, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3d13dae2-7b70-44aa-8549-cbb2c2dbc424","name":"3d13dae2-7b70-44aa-8549-cbb2c2dbc424","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":232, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"60e7fd4f-7783-44f5-a681-eabe60cc1dc4","blendMode":0,"displayName":"default (2)","isLocked":false,"name":"60e7fd4f-7783-44f5-a681-eabe60cc1dc4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - {"$GMImageLayer":"","%Name":"468e0a30-2dea-45bc-a7bd-4b115f803d2d","blendMode":0,"displayName":"default","isLocked":false,"name":"468e0a30-2dea-45bc-a7bd-4b115f803d2d","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"15ec2c68-c987-495a-ad96-2f90a4749ca3","blendMode":0,"displayName":"default","isLocked":false,"name":"15ec2c68-c987-495a-ad96-2f90a4749ca3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "name":"spr_mk7_complex_left_pauldron_shadow", - "nineSlice":{ - "$GMNineSliceData":"", - "bottom":0, - "enabled":false, - "guideColour":[4294902015,4294902015,4294902015,4294902015,], - "highlightColour":1728023040, - "highlightStyle":0, - "left":0, - "resourceType":"GMNineSliceData", - "resourceVersion":"2.0", - "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], - "top":0, - }, + "name":"spr_mk4_right_arm_shadow", + "nineSlice":null, "origin":9, "parent":{ - "name":"mk_7_complex", - "path":"folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + "name":"mk_4_complex", + "path":"folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", }, "preMultiplyAlpha":false, "resourceType":"GMSprite", "resourceVersion":"2.0", "sequence":{ "$GMSequence":"v1", - "%Name":"spr_mk7_complex_left_pauldron_shadow", + "%Name":"spr_mk4_right_arm_shadow", "autoRecord":true, "backdropHeight":768, "backdropImageOpacity":0.5, @@ -77,7 +57,7 @@ "resourceType":"KeyframeStore", "resourceVersion":"2.0", }, - "name":"spr_mk7_complex_left_pauldron_shadow", + "name":"spr_mk4_right_arm_shadow", "playback":1, "playbackSpeed":30.0, "playbackSpeedType":0, @@ -91,8 +71,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_left_pauldron_shadow/spr_mk7_complex_left_pauldron_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ffd25d2-f283-4823-9926-1576535448ca","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d13dae2-7b70-44aa-8549-cbb2c2dbc424","path":"sprites/spr_mk4_right_arm_shadow/spr_mk4_right_arm_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f71a2b82-4ed7-4326-8120-bacd0e4bcda0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk5_right_arm_shadow/4562abe0-e286-4146-bdf1-58e7d3303d26.png b/sprites/spr_mk5_right_arm_shadow/4562abe0-e286-4146-bdf1-58e7d3303d26.png new file mode 100644 index 0000000000..4e6f398155 Binary files /dev/null and b/sprites/spr_mk5_right_arm_shadow/4562abe0-e286-4146-bdf1-58e7d3303d26.png differ diff --git a/sprites/spr_mk5_right_arm_shadow/layers/4562abe0-e286-4146-bdf1-58e7d3303d26/bac5b4ca-abcb-41a0-9f00-48051b29b22b.png b/sprites/spr_mk5_right_arm_shadow/layers/4562abe0-e286-4146-bdf1-58e7d3303d26/bac5b4ca-abcb-41a0-9f00-48051b29b22b.png new file mode 100644 index 0000000000..4e6f398155 Binary files /dev/null and b/sprites/spr_mk5_right_arm_shadow/layers/4562abe0-e286-4146-bdf1-58e7d3303d26/bac5b4ca-abcb-41a0-9f00-48051b29b22b.png differ diff --git a/sprites/spr_mk5_right_arm_shadow/spr_mk5_right_arm_shadow.yy b/sprites/spr_mk5_right_arm_shadow/spr_mk5_right_arm_shadow.yy new file mode 100644 index 0000000000..f3fbaf2ff2 --- /dev/null +++ b/sprites/spr_mk5_right_arm_shadow/spr_mk5_right_arm_shadow.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_mk5_right_arm_shadow", + "bboxMode":0, + "bbox_bottom":125, + "bbox_left":13, + "bbox_right":45, + "bbox_top":66, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"4562abe0-e286-4146-bdf1-58e7d3303d26","name":"4562abe0-e286-4146-bdf1-58e7d3303d26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"bac5b4ca-abcb-41a0-9f00-48051b29b22b","blendMode":0,"displayName":"default","isLocked":false,"name":"bac5b4ca-abcb-41a0-9f00-48051b29b22b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_mk5_right_arm_shadow", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"mk_5_complex", + "path":"folders/Sprites/Marine Viewer/body_types/mk_5_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_mk5_right_arm_shadow", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_mk5_right_arm_shadow", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4562abe0-e286-4146-bdf1-58e7d3303d26","path":"sprites/spr_mk5_right_arm_shadow/spr_mk5_right_arm_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0eff2ca1-b5ad-4602-87a1-706f52833ec3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":164, +} \ No newline at end of file diff --git a/sprites/spr_mk6_complex/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png b/sprites/spr_mk6_complex/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png index 54409ebc51..b4bacfd0c5 100644 Binary files a/sprites/spr_mk6_complex/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png and b/sprites/spr_mk6_complex/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png differ diff --git a/sprites/spr_mk6_complex/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/78fed957-a769-4e64-9288-8be2bf39a5d4.png b/sprites/spr_mk6_complex/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/78fed957-a769-4e64-9288-8be2bf39a5d4.png index 54409ebc51..b4bacfd0c5 100644 Binary files a/sprites/spr_mk6_complex/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/78fed957-a769-4e64-9288-8be2bf39a5d4.png and b/sprites/spr_mk6_complex/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/78fed957-a769-4e64-9288-8be2bf39a5d4.png differ diff --git a/sprites/spr_mk6_complex/spr_mk6_complex.yy b/sprites/spr_mk6_complex/spr_mk6_complex.yy index 881148f0e6..002e3e15dd 100644 --- a/sprites/spr_mk6_complex/spr_mk6_complex.yy +++ b/sprites/spr_mk6_complex/spr_mk6_complex.yy @@ -3,9 +3,9 @@ "%Name":"spr_mk6_complex", "bboxMode":0, "bbox_bottom":220, - "bbox_left":11, - "bbox_right":152, - "bbox_top":26, + "bbox_left":12, + "bbox_right":151, + "bbox_top":30, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_complex/spr_mk6_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"23021aeb-0c67-4243-bf92-73fe45924fe0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_complex/spr_mk6_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"23021aeb-0c67-4243-bf92-73fe45924fe0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy b/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy index cc446affb7..d3afeb8d85 100644 --- a/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy +++ b/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","path":"sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8fea9cd1-fb34-40d9-a036-61a42fecb51b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","path":"sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8fea9cd1-fb34-40d9-a036-61a42fecb51b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_complex_left_pauldron/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex_left_pauldron/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png deleted file mode 100644 index 04baa11cca..0000000000 Binary files a/sprites/spr_mk7_complex_left_pauldron/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png and /dev/null differ diff --git a/sprites/spr_mk7_complex_left_pauldron/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_complex_left_pauldron/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png deleted file mode 100644 index 04baa11cca..0000000000 Binary files a/sprites/spr_mk7_complex_left_pauldron/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png and /dev/null differ diff --git a/sprites/spr_mk7_complex_left_pauldron_shadow/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex_left_pauldron_shadow/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png deleted file mode 100644 index ac84216537..0000000000 Binary files a/sprites/spr_mk7_complex_left_pauldron_shadow/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png and /dev/null differ diff --git a/sprites/spr_mk7_complex_left_pauldron_shadow/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_complex_left_pauldron_shadow/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png deleted file mode 100644 index 7e08510be6..0000000000 Binary files a/sprites/spr_mk7_complex_left_pauldron_shadow/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png and /dev/null differ diff --git a/sprites/spr_mk7_complex_left_pauldron_shadow/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/60e7fd4f-7783-44f5-a681-eabe60cc1dc4.png b/sprites/spr_mk7_complex_left_pauldron_shadow/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/60e7fd4f-7783-44f5-a681-eabe60cc1dc4.png deleted file mode 100644 index ac84216537..0000000000 Binary files a/sprites/spr_mk7_complex_left_pauldron_shadow/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/60e7fd4f-7783-44f5-a681-eabe60cc1dc4.png and /dev/null differ diff --git a/sprites/spr_mk7_complex_right_pauldron/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex_right_pauldron/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png index 652239c39b..d9799e5b8e 100644 Binary files a/sprites/spr_mk7_complex_right_pauldron/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png and b/sprites/spr_mk7_complex_right_pauldron/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png differ diff --git a/sprites/spr_mk7_complex_right_pauldron/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_complex_right_pauldron/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png index 652239c39b..d9799e5b8e 100644 Binary files a/sprites/spr_mk7_complex_right_pauldron/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png and b/sprites/spr_mk7_complex_right_pauldron/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy b/sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy index 11463c5a93..f60e4a3bf7 100644 --- a/sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy +++ b/sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy @@ -42,7 +42,7 @@ ], "top":0, }, - "origin":9, + "origin":0, "parent":{ "name":"mk_7_complex", "path":"folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", @@ -96,7 +96,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":-2, + "xorigin":0, "yorigin":0, }, "swatchColours":null, diff --git a/sprites/spr_mk7_complex_right_pauldron_shadow/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex_right_pauldron_shadow/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png index 653baab393..a18451ca5b 100644 Binary files a/sprites/spr_mk7_complex_right_pauldron_shadow/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png and b/sprites/spr_mk7_complex_right_pauldron_shadow/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png differ diff --git a/sprites/spr_mk7_complex_right_pauldron_shadow/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/60e7fd4f-7783-44f5-a681-eabe60cc1dc4.png b/sprites/spr_mk7_complex_right_pauldron_shadow/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/60e7fd4f-7783-44f5-a681-eabe60cc1dc4.png index 653baab393..a18451ca5b 100644 Binary files a/sprites/spr_mk7_complex_right_pauldron_shadow/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/60e7fd4f-7783-44f5-a681-eabe60cc1dc4.png and b/sprites/spr_mk7_complex_right_pauldron_shadow/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/60e7fd4f-7783-44f5-a681-eabe60cc1dc4.png differ diff --git a/sprites/spr_mk7_complex_right_pauldron_shadow/spr_mk7_complex_right_pauldron_shadow.yy b/sprites/spr_mk7_complex_right_pauldron_shadow/spr_mk7_complex_right_pauldron_shadow.yy index 5ec1dbc932..1af11c5cc2 100644 --- a/sprites/spr_mk7_complex_right_pauldron_shadow/spr_mk7_complex_right_pauldron_shadow.yy +++ b/sprites/spr_mk7_complex_right_pauldron_shadow/spr_mk7_complex_right_pauldron_shadow.yy @@ -43,7 +43,7 @@ ], "top":0, }, - "origin":9, + "origin":0, "parent":{ "name":"mk_7_complex", "path":"folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", @@ -97,7 +97,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":-2, + "xorigin":0, "yorigin":0, }, "swatchColours":null, diff --git a/sprites/spr_mk7_right_arm_shadow/cfe568ab-9ef3-408a-9d05-1decc5d59df3.png b/sprites/spr_mk7_right_arm_shadow/cfe568ab-9ef3-408a-9d05-1decc5d59df3.png new file mode 100644 index 0000000000..2da5e2c471 Binary files /dev/null and b/sprites/spr_mk7_right_arm_shadow/cfe568ab-9ef3-408a-9d05-1decc5d59df3.png differ diff --git a/sprites/spr_mk7_right_arm_shadow/layers/cfe568ab-9ef3-408a-9d05-1decc5d59df3/70be6473-60f8-463e-b96c-cabfe91ace59.png b/sprites/spr_mk7_right_arm_shadow/layers/cfe568ab-9ef3-408a-9d05-1decc5d59df3/70be6473-60f8-463e-b96c-cabfe91ace59.png new file mode 100644 index 0000000000..2da5e2c471 Binary files /dev/null and b/sprites/spr_mk7_right_arm_shadow/layers/cfe568ab-9ef3-408a-9d05-1decc5d59df3/70be6473-60f8-463e-b96c-cabfe91ace59.png differ diff --git a/sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy b/sprites/spr_mk7_right_arm_shadow/spr_mk7_right_arm_shadow.yy similarity index 64% rename from sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy rename to sprites/spr_mk7_right_arm_shadow/spr_mk7_right_arm_shadow.yy index 27d6923907..ecc5154a2f 100644 --- a/sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy +++ b/sprites/spr_mk7_right_arm_shadow/spr_mk7_right_arm_shadow.yy @@ -1,47 +1,28 @@ { "$GMSprite":"v2", - "%Name":"spr_mk7_complex_left_pauldron", + "%Name":"spr_mk7_right_arm_shadow", "bboxMode":0, - "bbox_bottom":81, - "bbox_left":105, - "bbox_right":152, - "bbox_top":28, + "bbox_bottom":125, + "bbox_left":13, + "bbox_right":45, + "bbox_top":66, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfe568ab-9ef3-408a-9d05-1decc5d59df3","name":"cfe568ab-9ef3-408a-9d05-1decc5d59df3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":232, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"468e0a30-2dea-45bc-a7bd-4b115f803d2d","blendMode":0,"displayName":"default","isLocked":false,"name":"468e0a30-2dea-45bc-a7bd-4b115f803d2d","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"70be6473-60f8-463e-b96c-cabfe91ace59","blendMode":0,"displayName":"default","isLocked":false,"name":"70be6473-60f8-463e-b96c-cabfe91ace59","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "name":"spr_mk7_complex_left_pauldron", - "nineSlice":{ - "$GMNineSliceData":"", - "bottom":0, - "enabled":false, - "guideColour":[4294902015,4294902015,4294902015,4294902015,], - "highlightColour":1728023040, - "highlightStyle":0, - "left":0, - "resourceType":"GMNineSliceData", - "resourceVersion":"2.0", - "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], - "top":0, - }, + "name":"spr_mk7_right_arm_shadow", + "nineSlice":null, "origin":9, "parent":{ "name":"mk_7_complex", @@ -52,7 +33,7 @@ "resourceVersion":"2.0", "sequence":{ "$GMSequence":"v1", - "%Name":"spr_mk7_complex_left_pauldron", + "%Name":"spr_mk7_right_arm_shadow", "autoRecord":true, "backdropHeight":768, "backdropImageOpacity":0.5, @@ -76,7 +57,7 @@ "resourceType":"KeyframeStore", "resourceVersion":"2.0", }, - "name":"spr_mk7_complex_left_pauldron", + "name":"spr_mk7_right_arm_shadow", "playback":1, "playbackSpeed":30.0, "playbackSpeedType":0, @@ -90,8 +71,8 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ffd25d2-f283-4823-9926-1576535448ca","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfe568ab-9ef3-408a-9d05-1decc5d59df3","path":"sprites/spr_mk7_right_arm_shadow/spr_mk7_right_arm_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c1fa9940-04b6-435f-b159-29ad2d8e834c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null,