From f95a726eb08b9d24ed83e08970edfbcafd5da833 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Wed, 24 Sep 2025 21:02:02 +0100 Subject: [PATCH 1/6] flip functionality and arms --- ChapterMaster.yyp | 7 +- scripts/scr_ComplexSet/scr_ComplexSet.gml | 8 - .../scr_culture_visuals.gml | 363 ++++++++---------- .../scr_sprite_helpers/scr_sprite_helpers.gml | 6 +- .../right_left_swap_shader.fsh | 93 +++++ .../right_left_swap_shader.vsh | 19 + .../right_left_swap_shader.yy | 12 + .../6a57f22a-0d22-44d9-9f77-fc818daa157a.png | Bin 0 -> 1708 bytes .../a36cc102-af8d-4321-bd66-cbf3f0ad2435.png | Bin 0 -> 1708 bytes .../spr_mk3_right_arm_shadow.yy | 92 +++++ .../3d13dae2-7b70-44aa-8549-cbb2c2dbc424.png | Bin 0 -> 1746 bytes .../15ec2c68-c987-495a-ad96-2f90a4749ca3.png | Bin 0 -> 1746 bytes .../spr_mk4_right_arm_shadow.yy | 92 +++++ .../4562abe0-e286-4146-bdf1-58e7d3303d26.png | Bin 0 -> 1746 bytes .../bac5b4ca-abcb-41a0-9f00-48051b29b22b.png | Bin 0 -> 1746 bytes .../spr_mk5_right_arm_shadow.yy | 92 +++++ .../spr_mk6_right_arm/spr_mk6_right_arm.yy | 6 +- .../cfe568ab-9ef3-408a-9d05-1decc5d59df3.png | Bin 0 -> 1746 bytes .../70be6473-60f8-463e-b96c-cabfe91ace59.png | Bin 0 -> 1746 bytes .../spr_mk7_right_arm_shadow.yy | 92 +++++ 20 files changed, 667 insertions(+), 215 deletions(-) create mode 100644 shaders/right_left_swap_shader/right_left_swap_shader.fsh create mode 100644 shaders/right_left_swap_shader/right_left_swap_shader.vsh create mode 100644 shaders/right_left_swap_shader/right_left_swap_shader.yy create mode 100644 sprites/spr_mk3_right_arm_shadow/6a57f22a-0d22-44d9-9f77-fc818daa157a.png create mode 100644 sprites/spr_mk3_right_arm_shadow/layers/6a57f22a-0d22-44d9-9f77-fc818daa157a/a36cc102-af8d-4321-bd66-cbf3f0ad2435.png create mode 100644 sprites/spr_mk3_right_arm_shadow/spr_mk3_right_arm_shadow.yy create mode 100644 sprites/spr_mk4_right_arm_shadow/3d13dae2-7b70-44aa-8549-cbb2c2dbc424.png create mode 100644 sprites/spr_mk4_right_arm_shadow/layers/3d13dae2-7b70-44aa-8549-cbb2c2dbc424/15ec2c68-c987-495a-ad96-2f90a4749ca3.png create mode 100644 sprites/spr_mk4_right_arm_shadow/spr_mk4_right_arm_shadow.yy create mode 100644 sprites/spr_mk5_right_arm_shadow/4562abe0-e286-4146-bdf1-58e7d3303d26.png create mode 100644 sprites/spr_mk5_right_arm_shadow/layers/4562abe0-e286-4146-bdf1-58e7d3303d26/bac5b4ca-abcb-41a0-9f00-48051b29b22b.png create mode 100644 sprites/spr_mk5_right_arm_shadow/spr_mk5_right_arm_shadow.yy create mode 100644 sprites/spr_mk7_right_arm_shadow/cfe568ab-9ef3-408a-9d05-1decc5d59df3.png create mode 100644 sprites/spr_mk7_right_arm_shadow/layers/cfe568ab-9ef3-408a-9d05-1decc5d59df3/70be6473-60f8-463e-b96c-cabfe91ace59.png create mode 100644 sprites/spr_mk7_right_arm_shadow/spr_mk7_right_arm_shadow.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 4c643de624..36c0324afe 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -576,7 +576,7 @@ "isEcma":false, "LibraryEmitters":[], "MetaData":{ - "IDEVersion":"2024.1400.0.892", + "IDEVersion":"2024.1400.0.884", }, "name":"ChapterMaster", "resources":[ @@ -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",},}, @@ -1439,6 +1443,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..4eddffd869 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -1280,8 +1280,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 +1291,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 +1307,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 +1319,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_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 9b15d84644..94e02bf652 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 0000000000000000000000000000000000000000..0bcbdb1e7218b1a3ba466170b173b5f2ddf1f4f1 GIT binary patch literal 1708 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^H2J_g0SO6s0;PxSmx;iKE0aLb+f zV6;T+_S({T>*0aAmk+l2ouZgph+iT7U4 zf%6h_uMC~e9ad3Jxn630`OWwD_gAla1tjC^eAy2_e|bkiJanrp+fDwBM=eXd)=ZbE zJZW~*?1|ms4^az}7k=Ac2DIS(eEZd}&fiq1{`}d%bArFWzx8r~)!+Ji&TbUkRL>LK z^SN-NV3E#_x+U$)KABnZ@%_KCaAxDlraR_cva@F$?>Tb9C#F=oXvbd*p5mP`|I**z zDzVjnF4w+h)vd64Cfe38s=v$u^3@9!^B zep0pfAIBzL*X-wuqbKC@?|HjNX4a?s&Z19xV*Xe>v3o1j9>2d%HtJ^b`>Hgxxtngk zxG{gz@nx@*|I6oDo4K9%UH*AB-|b$8TN;_NPxi!qxo5Y$r>}a(s`OWBw&n!Hp8m4iw)VZ=aefKyj|L2w6NZ+AxT`6{z+MUyJ>#xt>)qZ})ckg81yT)db6PC{@ zeYqHX|GQ+If971eujrFS_x$C*-Jiap{_}5PClf29n>*h;d(i!L z`U+mL7xP3G7vKDz|4QMvU+u%m?rx6v_It~<%d~B?{Z#qkT|`Qu%p{E_l`e%&C67fM zqf9K}@SkCN?HBEhSGR2h7T&5Qt`Q|Ei6yC4$wjF^iowXh$W+(BQrE~N#K73f*uu)d zOxwV~%D~`k$@+CD8glbfGSez?YuKYHE(Fw|0k@$fGdH!kBr&%Dx1QHFW@mwV7(8A5 KT-G@yGywn{W#a7s literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0bcbdb1e7218b1a3ba466170b173b5f2ddf1f4f1 GIT binary patch literal 1708 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^H2J_g0SO6s0;PxSmx;iKE0aLb+f zV6;T+_S({T>*0aAmk+l2ouZgph+iT7U4 zf%6h_uMC~e9ad3Jxn630`OWwD_gAla1tjC^eAy2_e|bkiJanrp+fDwBM=eXd)=ZbE zJZW~*?1|ms4^az}7k=Ac2DIS(eEZd}&fiq1{`}d%bArFWzx8r~)!+Ji&TbUkRL>LK z^SN-NV3E#_x+U$)KABnZ@%_KCaAxDlraR_cva@F$?>Tb9C#F=oXvbd*p5mP`|I**z zDzVjnF4w+h)vd64Cfe38s=v$u^3@9!^B zep0pfAIBzL*X-wuqbKC@?|HjNX4a?s&Z19xV*Xe>v3o1j9>2d%HtJ^b`>Hgxxtngk zxG{gz@nx@*|I6oDo4K9%UH*AB-|b$8TN;_NPxi!qxo5Y$r>}a(s`OWBw&n!Hp8m4iw)VZ=aefKyj|L2w6NZ+AxT`6{z+MUyJ>#xt>)qZ})ckg81yT)db6PC{@ zeYqHX|GQ+If971eujrFS_x$C*-Jiap{_}5PClf29n>*h;d(i!L z`U+mL7xP3G7vKDz|4QMvU+u%m?rx6v_It~<%d~B?{Z#qkT|`Qu%p{E_l`e%&C67fM zqf9K}@SkCN?HBEhSGR2h7T&5Qt`Q|Ei6yC4$wjF^iowXh$W+(BQrE~N#K73f*uu)d zOxwV~%D~`k$@+CD8glbfGSez?YuKYHE(Fw|0k@$fGdH!kBr&%Dx1QHFW@mwV7(8A5 KT-G@yGywn{W#a7s literal 0 HcmV?d00001 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_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 0000000000000000000000000000000000000000..a519247762cdd689f85846672a1f01917039f163 GIT binary patch literal 1746 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^STT9o-yvgI-K)GEeN9Cb)^`Z2!ub$Z2z2CeD_AEu)budz|;_qrVeW zD=%-$b?mC&_lv#3&QZv9f{UO^Ad9ESP+(4}e_nGrZS&4=Prv2=d60WM&+fn0l9{4U zqUGe}SFg(2etWLm?YCuHZ@*oYIcwFb%kQ0o`@ir1_UqR#)Bn+T=4j5=@MgEPij|hF zTz}O4#KxDu*w)CuzjAi@o9}&n0b6q>)Tfr8t&J{ek@34OFDctQCq%dS#`9;&i+Rsh z)tH^ww(8Z>r%UDJT`sX(@Xhgl`TV-~ zmoHyFnw;-@y;<RDR;x^LNF*+TUTJq5JFp?)q_TzI}b1&9$|*$7ig& zp89Qyt!VPq%8uAM&VQem1lL^sYO%9^bMu~U#qatj91h&{`_>hWTm73?W$nKE?SIza zis#SPDc)Z7`D?;ulXOGh-k#dz;Hsx;+|(NVZ|o{=6c)CvzqjtM7B~ z(JtOBT=M(!SD&Pqg{~l*<*lw4zS((i^Rld&3i*bUBxS=-rEYMEv^gOipL=5N?wfkQ zm8GR#yIYyh-*kWTLdgwvF^1V5i#R4}#LF%Ds$3f{_oU(L<5NpnPoB~hd-CDYn(qd& z##>&j4O!-QNOrg70glV2pZzZU{rC6x%k#${e=OM;{(s4xWtny*(|*+Lzc15&{MP&L zf3MH0*(Y4`{&LcH3Hf6YrItoz{r$f0k3Zgc_x*RblT&AlKG`}k+v~sVtmDUzcbDhH z#mD=vzb&sCIbHu|>TYqBV6mB-erF$@K7INsA=%G5f+^eIWv^ZZOgL`yzkK;p(pA!U zT6#yYcMRL@$fVo5SN_`Ew&ir({G;|Kvn#ZxY`lD4jj!c);^sHY(%$T|Ic$8Qe0OZ_ z_S=`&%Q?$+_f7~;ezoY$dPVDI!OgnLPgm)hIra7SIbUD5U9xA|nk(`4d_Vg%eD7*M z`(g|Z6saY%CmL<}QFvl!i)ZMGDYh1BFE^a;a%JJ1>)Jf0I)45=+2Y{Knknf}~0EVj-h=6|#4`r0S#uS>fR z+leQZsja&!rmVi*hR;$g>i4nhkvk*Pdk(L);2Rnx%77JnQ~opTbN*U$y?R9ru!vVJ zag8WRNi0dVN-jzTQVd20My9$3mbykJA%>P#rp8vL2HFM&Rt5%vj!GgZ8glbfGSez? qYfzAxwF0O?18ze}W^QV6Nn&mRZaw9kyUT%k7(8A5T-G@yGywpQWz16m literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a519247762cdd689f85846672a1f01917039f163 GIT binary patch literal 1746 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^STT9o-yvgI-K)GEeN9Cb)^`Z2!ub$Z2z2CeD_AEu)budz|;_qrVeW zD=%-$b?mC&_lv#3&QZv9f{UO^Ad9ESP+(4}e_nGrZS&4=Prv2=d60WM&+fn0l9{4U zqUGe}SFg(2etWLm?YCuHZ@*oYIcwFb%kQ0o`@ir1_UqR#)Bn+T=4j5=@MgEPij|hF zTz}O4#KxDu*w)CuzjAi@o9}&n0b6q>)Tfr8t&J{ek@34OFDctQCq%dS#`9;&i+Rsh z)tH^ww(8Z>r%UDJT`sX(@Xhgl`TV-~ zmoHyFnw;-@y;<RDR;x^LNF*+TUTJq5JFp?)q_TzI}b1&9$|*$7ig& zp89Qyt!VPq%8uAM&VQem1lL^sYO%9^bMu~U#qatj91h&{`_>hWTm73?W$nKE?SIza zis#SPDc)Z7`D?;ulXOGh-k#dz;Hsx;+|(NVZ|o{=6c)CvzqjtM7B~ z(JtOBT=M(!SD&Pqg{~l*<*lw4zS((i^Rld&3i*bUBxS=-rEYMEv^gOipL=5N?wfkQ zm8GR#yIYyh-*kWTLdgwvF^1V5i#R4}#LF%Ds$3f{_oU(L<5NpnPoB~hd-CDYn(qd& z##>&j4O!-QNOrg70glV2pZzZU{rC6x%k#${e=OM;{(s4xWtny*(|*+Lzc15&{MP&L zf3MH0*(Y4`{&LcH3Hf6YrItoz{r$f0k3Zgc_x*RblT&AlKG`}k+v~sVtmDUzcbDhH z#mD=vzb&sCIbHu|>TYqBV6mB-erF$@K7INsA=%G5f+^eIWv^ZZOgL`yzkK;p(pA!U zT6#yYcMRL@$fVo5SN_`Ew&ir({G;|Kvn#ZxY`lD4jj!c);^sHY(%$T|Ic$8Qe0OZ_ z_S=`&%Q?$+_f7~;ezoY$dPVDI!OgnLPgm)hIra7SIbUD5U9xA|nk(`4d_Vg%eD7*M z`(g|Z6saY%CmL<}QFvl!i)ZMGDYh1BFE^a;a%JJ1>)Jf0I)45=+2Y{Knknf}~0EVj-h=6|#4`r0S#uS>fR z+leQZsja&!rmVi*hR;$g>i4nhkvk*Pdk(L);2Rnx%77JnQ~opTbN*U$y?R9ru!vVJ zag8WRNi0dVN-jzTQVd20My9$3mbykJA%>P#rp8vL2HFM&Rt5%vj!GgZ8glbfGSez? qYfzAxwF0O?18ze}W^QV6Nn&mRZaw9kyUT%k7(8A5T-G@yGywpQWz16m literal 0 HcmV?d00001 diff --git a/sprites/spr_mk4_right_arm_shadow/spr_mk4_right_arm_shadow.yy b/sprites/spr_mk4_right_arm_shadow/spr_mk4_right_arm_shadow.yy new file mode 100644 index 0000000000..2a9c3ae82a --- /dev/null +++ b/sprites/spr_mk4_right_arm_shadow/spr_mk4_right_arm_shadow.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_mk4_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":"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":"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_mk4_right_arm_shadow", + "nineSlice":null, + "origin":9, + "parent":{ + "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_mk4_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_mk4_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":"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, + "volume":1.0, + "xorigin":-2, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":164, +} \ No newline at end of file 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 0000000000000000000000000000000000000000..4e6f398155ed675a73ac51fb9cacea5af04ce66e GIT binary patch literal 1746 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^STT9o-yvgI-K)GEeN9Cb)^`Z2!ub$Z2z2CeD_AEu)budz|;_qrVeW zD=%-$b?mC&_lv#3&QZv9f{UO^Ad9ESP+(4}e_nGrZS&4=Prv2=d60WM&+fn0l9{4U zqUGe}SFg(2etWLm?YCuHZ@*oYIcwFb%kQ0o`@ir1_UqR#)Bn+T=4j5=@MgEPij|hF zTz}O4#KxDu*w)CuzjAi@o9}&n0b6q>)Tfr8t&J{ek@34OFDctQCq%dS#`9;&i+Rsh z)tH^ww(8Z>r%UDJT`sX(@Xhgl`TV-~ zmoHyFnw;-@y;<RDR;x^LNF*+TUTJq5JFp?)q_TzI}b1&9$|*$7ig& zp89Qyt!VPq%8uAM&VQem1lL^sYO%9^bMu~U#qatj91h&{`_>hWTm73?W$nKE?SIza zis#SPDc)Z7`D?;ulXOGh-k#dz;Hsx;+|(NVZ|o{=6c)CvzqjtM7B~ z(JtOBT=M(!SD&Pqg{~l*<*lw4zS((i^Rld&3i*bUBxS=-rEYMEv^gOipL=5N?wfkQ zm8GR#yIYyh-*kWTLdgwvF^1V5i#R4}#LF%Ds$3f{_oU(L<5NpnPoB~hd-CDYn(qd& z##>&j4O!-QNOrg70glV2pZzZU{rC6x%k#${e=OM;{(s4xWtny*(|*+Lzc15&{MP&L zf3MH0*(Y4`{&LcH3Hf6YrItoz{r$f0k3Zgc_x*RblT&AlKG`}k+v~sVtmDUzcbDhH z#mD=vzb&sCIbHu|>TYqBV6mB-erF$@K7INsA=%G5f+^eIWv^ZZOgL`yzkK;p(pA!U zT6#yYcMRL@$fVo5SN_`Ew&ir({G;|Kvn#ZxY`lD4jj!c);^sHY(%$T|Ic$8Qe0OZ_ z_S=`&%Q?$+_f7~;ezoY$dPVDI!OgnLPgm)hIra7SIbUD5U9xA|nk(`4d_Vg%eD7*M z`(g|Z6saY%CmL<}QFvl!i)ZMGDYh1BFE^a;a%JJ1>)Jf0I)45=+2Y{Knknf}~0EVj-h=6|#4`r0S#uS>fR z+leQZsja&!rmVi*hR;$g>i4nhkvk*Pdk(L);2Rnx%77JnQ~opTbN*U$y?R9ru!vVJ zag8WRNi0dVN-jzTQVd20My9$3mbykJAqK`)#^zRrCfWuDRt5&?UQef>Xvob^$xN%n qtwBsYRs*O(18ze}W^QV6Nn&mRZat1nHQ#}H7(8A5T-G@yGywqgUCiD9 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4e6f398155ed675a73ac51fb9cacea5af04ce66e GIT binary patch literal 1746 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^STT9o-yvgI-K)GEeN9Cb)^`Z2!ub$Z2z2CeD_AEu)budz|;_qrVeW zD=%-$b?mC&_lv#3&QZv9f{UO^Ad9ESP+(4}e_nGrZS&4=Prv2=d60WM&+fn0l9{4U zqUGe}SFg(2etWLm?YCuHZ@*oYIcwFb%kQ0o`@ir1_UqR#)Bn+T=4j5=@MgEPij|hF zTz}O4#KxDu*w)CuzjAi@o9}&n0b6q>)Tfr8t&J{ek@34OFDctQCq%dS#`9;&i+Rsh z)tH^ww(8Z>r%UDJT`sX(@Xhgl`TV-~ zmoHyFnw;-@y;<RDR;x^LNF*+TUTJq5JFp?)q_TzI}b1&9$|*$7ig& zp89Qyt!VPq%8uAM&VQem1lL^sYO%9^bMu~U#qatj91h&{`_>hWTm73?W$nKE?SIza zis#SPDc)Z7`D?;ulXOGh-k#dz;Hsx;+|(NVZ|o{=6c)CvzqjtM7B~ z(JtOBT=M(!SD&Pqg{~l*<*lw4zS((i^Rld&3i*bUBxS=-rEYMEv^gOipL=5N?wfkQ zm8GR#yIYyh-*kWTLdgwvF^1V5i#R4}#LF%Ds$3f{_oU(L<5NpnPoB~hd-CDYn(qd& z##>&j4O!-QNOrg70glV2pZzZU{rC6x%k#${e=OM;{(s4xWtny*(|*+Lzc15&{MP&L zf3MH0*(Y4`{&LcH3Hf6YrItoz{r$f0k3Zgc_x*RblT&AlKG`}k+v~sVtmDUzcbDhH z#mD=vzb&sCIbHu|>TYqBV6mB-erF$@K7INsA=%G5f+^eIWv^ZZOgL`yzkK;p(pA!U zT6#yYcMRL@$fVo5SN_`Ew&ir({G;|Kvn#ZxY`lD4jj!c);^sHY(%$T|Ic$8Qe0OZ_ z_S=`&%Q?$+_f7~;ezoY$dPVDI!OgnLPgm)hIra7SIbUD5U9xA|nk(`4d_Vg%eD7*M z`(g|Z6saY%CmL<}QFvl!i)ZMGDYh1BFE^a;a%JJ1>)Jf0I)45=+2Y{Knknf}~0EVj-h=6|#4`r0S#uS>fR z+leQZsja&!rmVi*hR;$g>i4nhkvk*Pdk(L);2Rnx%77JnQ~opTbN*U$y?R9ru!vVJ zag8WRNi0dVN-jzTQVd20My9$3mbykJAqK`)#^zRrCfWuDRt5&?UQef>Xvob^$xN%n qtwBsYRs*O(18ze}W^QV6Nn&mRZat1nHQ#}H7(8A5T-G@yGywqgUCiD9 literal 0 HcmV?d00001 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_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_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 0000000000000000000000000000000000000000..2da5e2c471231ed677b837a11e37888c8c712bdd GIT binary patch literal 1746 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":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_mk7_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":"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, + "volume":1.0, + "xorigin":-2, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":164, +} \ No newline at end of file From 0a8cbd960745f286b75a3bbdf858db5a2c0c7d30 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Wed, 24 Sep 2025 21:56:45 +0100 Subject: [PATCH 2/6] add image capture button --- ChapterMaster.yyp | 2 +- .../scr_controller_helpers.gml | 6 ++ scripts/scr_ui_manage/scr_ui_manage.gml | 58 +++++++++++++++++++ 3 files changed, 65 insertions(+), 1 deletion(-) diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 36c0324afe..657334e5c3 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -576,7 +576,7 @@ "isEcma":false, "LibraryEmitters":[], "MetaData":{ - "IDEVersion":"2024.1400.0.884", + "IDEVersion":"2024.1400.0.892", }, "name":"ChapterMaster", "resources":[ 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_ui_manage/scr_ui_manage.gml b/scripts/scr_ui_manage/scr_ui_manage.gml index 8fcca894ce..a935f8e312 100644 --- a/scripts/scr_ui_manage/scr_ui_manage.gml +++ b/scripts/scr_ui_manage/scr_ui_manage.gml @@ -547,6 +547,64 @@ function alternative_manage_views(x1, y1) { } } } + // === Capture Image Button === + var _last_button_x = _squad_button.x2; // default if no profile/bio drawn + var _last_button_y = _squad_button.y1; + + // if profile is visible, place after profile toggle + if (!view_squad) { + _last_button_x = management_buttons.profile_toggle.x2; + _last_button_y = management_buttons.profile_toggle.y1; + + // if bio visible, place after bio toggle + if (unit_profile) { + _last_button_x = management_buttons.bio_toggle.x2; + _last_button_y = management_buttons.bio_toggle.y1; + } + } + + var _capture_button = management_buttons.capture_image; + _capture_button.update({ + x1: _last_button_x, + y1: _last_button_y + }); + + if (is_struct(obj_controller.unit_focus) && _capture_button.draw(!text_bar)) { + // Capture the sprite frame as PNG + var spr = obj_controller.unit_manage_image.unit_sprite; + var _unit = obj_controller.unit_focus; //unit struct + if (sprite_exists(spr)) { + var w = sprite_get_width(spr); + var h = sprite_get_height(spr); + + // create surface and draw sprite frame 0 + var surf = surface_create(w, h); + surface_set_target(surf); + draw_clear_alpha(c_black, 0); + draw_sprite(spr, 0, 0, 0); + surface_reset_target(); + + // save to local game folder + var base_name = working_directory + $"\\main\\marine_capture_{_unit.name()}_{_unit.marine_number}{_unit.company}"; + var extension = ".png"; + var index = 0; + var path; + + for (var i=0;i<=1000;i++){ // safety limit + path = base_name + string(index) + extension; + if (!file_exists(path)) { + break; + } + index++; + } + surface_save(surf, path); + + // cleanup + surface_free(surf); + + show_debug_message("Marine image saved to: " + path); + } + } } From fd3caf8fb7fb206aa5ce66b457870c472895cdc4 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Wed, 24 Sep 2025 21:59:10 +0100 Subject: [PATCH 3/6] missing debug messages --- scripts/scr_culture_visuals/scr_culture_visuals.gml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 94e02bf652..2722c7ae11 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -303,10 +303,8 @@ function set_up_visual_overides(){ for (var i=0;i Date: Wed, 24 Sep 2025 22:02:14 +0100 Subject: [PATCH 4/6] missing bracket --- scripts/scr_culture_visuals/scr_culture_visuals.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 2722c7ae11..de2c4f8a54 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -318,7 +318,7 @@ function set_up_visual_overides(){ if (struct_exists(_flip_mod, "overides")) { var _overides_name = struct_get_names(_flip_mod.overides); for (var o=0;o Date: Wed, 24 Sep 2025 22:41:18 +0100 Subject: [PATCH 5/6] make shader work for windws --- .../right_left_swap_shader.fsh | 65 ++++++++++--------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/shaders/right_left_swap_shader/right_left_swap_shader.fsh b/shaders/right_left_swap_shader/right_left_swap_shader.fsh index 27a7bcbb0f..54c2dc4089 100644 --- a/shaders/right_left_swap_shader/right_left_swap_shader.fsh +++ b/shaders/right_left_swap_shader/right_left_swap_shader.fsh @@ -1,39 +1,41 @@ -// // Simple passthrough fragment shader // varying vec2 v_vTexcoord; varying vec4 v_vColour; +// === Constants === +// put them in global scope so both main() and remapRightToLeft() can see them +const float _20COL = 20.0 / 255.0; +const float _24COL = 24.0 / 255.0; +const float _46COL = 46.0 / 255.0; +const float _60COL = 60.0 / 255.0; +const float _64COL = 64.0 / 255.0; +const float _84COL = 84.0 / 255.0; +const float _104COL = 104.0 / 255.0; +const float _112COL = 112.0 / 255.0; +const float _127_25COL = 127.25 / 255.0; +const float _128COL = 128.0 / 255.0; +const float _128_75COL = 128.75 / 255.0; +const float _130COL = 130.0 / 255.0; +const float _135COL = 135.0 / 255.0; +const float _138COL = 138.0 / 255.0; +const float _140COL = 140.0 / 255.0; +const float _147COL = 147.0 / 255.0; +const float _151COL = 151.0 / 255.0; +const float _160COL = 160.0 / 255.0; +const float _165COL = 165.0 / 255.0; +const float _168COL = 168.0 / 255.0; +const float _169COL = 169.0 / 255.0; +const float _170COL = 170.0 / 255.0; +const float _181COL = 181.0 / 255.0; +const float _188COL = 188.0 / 255.0; +const float _194COL = 194.0 / 255.0; +const float _214COL = 214.0 / 255.0; +const float _215COL = 215.0 / 255.0; +const float _218COL = 218.0 / 255.0; +const float _230COL = 230.0 / 255.0; + vec3 remapRightToLeft(vec3 col) { - const float _20COL = 20.0 / 255.0; - const float _24COL = 24.0 / 255.0; - const float _46COL = 46.0 / 255.0; - const float _60COL = 60.0 / 255.0; - const float _64COL = 64.0 / 255.0; - const float _84COL = 84.0 / 255.0; - const float _104COL = 104.0 / 255.0; - const float _112COL = 112.0 / 255.0; - const float _127_25COL = 127.25 / 255.0; - const float _128COL = 128.0 / 255.0; - const float _128_75COL = 128.75 / 255.0; - const float _130COL = 130.0 / 255.0; - const float _135COL = 135.0 / 255.0; - const float _138COL = 138.0 / 255.0; - const float _140COL = 140.0 / 255.0; - const float _147COL = 147.0 / 255.0; - const float _151COL = 151.0 / 255.0; - const float _160COL = 160.0 / 255.0; - const float _165COL = 165.0 / 255.0; - const float _168COL = 168.0 / 255.0; - const float _169COL = 169.0 / 255.0; - const float _170COL = 170.0 / 255.0; - const float _181COL = 181.0 / 255.0; - const float _188COL = 188.0 / 255.0; - const float _194COL = 194.0 / 255.0; - const float _214COL = 214.0 / 255.0; - const float _215COL = 215.0 / 255.0; - const float _218COL = 218.0 / 255.0; - const float _230COL = 230.0 / 255.0; // === Right → Left body mapping === if (col == vec3(0.0, 0.0, 1.0)) { // right_head return vec3(0.0, 0.0, _128COL); // left_head @@ -76,12 +78,11 @@ vec3 remapRightToLeft(vec3 col) { void main() { vec4 col_orig = texture2D(gm_BaseTexture, v_vTexcoord); - vec4 col_orig = texture2D(gm_BaseTexture, v_vTexcoord); if (col_orig.rgba == vec4(0.0, 0.0, 0.0, 0.0)) { discard; } - // Intel fix + // Intel fix — snap near-128 values to exact 128 if (col_orig.r >= _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; } From 730c934f261154d185a126d1ba66f6958d46f02d Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Wed, 24 Sep 2025 23:19:18 +0100 Subject: [PATCH 6/6] pauldron visual tweaks --- ChapterMaster.yyp | 2 - scripts/scr_ComplexSet/scr_ComplexSet.gml | 2 - .../scr_culture_visuals.gml | 14 +-- .../40cfe8bd-f11d-4d74-a157-47d58c39d7e8.png | Bin 4114 -> 3894 bytes .../e7b69ad2-206a-4f32-ade6-1a7c0f38210f.png | Bin 4107 -> 3887 bytes sprites/spr_mk4_complex/spr_mk4_complex.yy | 6 +- .../spr_mk4_head_variants.yy | 6 +- .../fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png | Bin 5794 -> 5017 bytes .../78fed957-a769-4e64-9288-8be2bf39a5d4.png | Bin 5794 -> 5017 bytes sprites/spr_mk6_complex/spr_mk6_complex.yy | 12 +- .../b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png | Bin 817 -> 0 bytes .../468e0a30-2dea-45bc-a7bd-4b115f803d2d.png | Bin 817 -> 0 bytes .../spr_mk7_complex_left_pauldron.yy | 111 ----------------- .../b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png | Bin 1227 -> 0 bytes .../468e0a30-2dea-45bc-a7bd-4b115f803d2d.png | Bin 1043 -> 0 bytes .../60e7fd4f-7783-44f5-a681-eabe60cc1dc4.png | Bin 1227 -> 0 bytes .../spr_mk7_complex_left_pauldron_shadow.yy | 112 ------------------ .../b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png | Bin 823 -> 823 bytes .../468e0a30-2dea-45bc-a7bd-4b115f803d2d.png | Bin 823 -> 823 bytes .../spr_mk7_complex_right_pauldron.yy | 4 +- .../b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png | Bin 1141 -> 1141 bytes .../60e7fd4f-7783-44f5-a681-eabe60cc1dc4.png | Bin 1141 -> 1141 bytes .../spr_mk7_complex_right_pauldron_shadow.yy | 4 +- 23 files changed, 27 insertions(+), 246 deletions(-) delete mode 100644 sprites/spr_mk7_complex_left_pauldron/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png delete mode 100644 sprites/spr_mk7_complex_left_pauldron/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png delete mode 100644 sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy delete mode 100644 sprites/spr_mk7_complex_left_pauldron_shadow/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png delete mode 100644 sprites/spr_mk7_complex_left_pauldron_shadow/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png delete mode 100644 sprites/spr_mk7_complex_left_pauldron_shadow/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/60e7fd4f-7783-44f5-a681-eabe60cc1dc4.png delete mode 100644 sprites/spr_mk7_complex_left_pauldron_shadow/spr_mk7_complex_left_pauldron_shadow.yy diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 657334e5c3..c983780a72 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1425,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",},}, diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 4eddffd869..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, diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index de2c4f8a54..54ed91f3c9 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -320,7 +320,7 @@ function set_up_visual_overides(){ for (var o=0;o}544-0IHqF^I&E>$lWoM6EE>(cA#O4RBS8)_GN~&KLfgg!Bn;71G*C!r-lD}3Q z>~dGL)zN19RvPIUzqBml90%#Fb6lDFm8`DZ>M8T^nVs(kVpS9H1a@5jXx%t`^|a|h zYvf44_of1RTX9)G{mt7Ziyv9U%StsJP+Vsjxu~uR4jSq}&&-7ZF0HBOu8j8+f*u@z z-S1h}CG+4HA16s^Sl>5j+c>m0b5e9(gZK_@(zXp1Ux_E!l2>UnU$QAiMpN(9AxrGT zAC1YeIfN(r?pkD}728DMW6>>Y)K6{nYZtXNI%rhr=4L%GaAkS2lej*aH2b2cIwR^% zTYu&HrIJ-E0rEXlRz(_@%jxR;AkM1787*dRc01m>=WjG#$SPdpC`pPttcaODaEgg+ z-x}7Lh+HdAtfcjltZ%1Zi!d@Spg=xb5&8rci;@^KU%nEPGyv=Sz-~rdg2$OrT->b1 zkH+oviN`E!v7HSQ8KhNX|Ka-OGnoonHn+)tw&Hj-r?ubG0*qLGp~t(zW)2*B{IrYr zHCE(%KEuwjUal$NI0E>RuXdOMg*;$>=4qcA|ba-vvrMEVyVt_43-oyNBWlOiin zo6*kaK?xRPK=k%v{c5|d>n>_7K?IV(M|~WM^K?o+243b$aK$eg=9B#V4U(sQ@W_0n zspwJe(2?0R9g=i@I5?p>Wm2P{C=>XN<~hQ=pC=pU|Mu+JY2!@N9T!Ct-~B}`6~xC* zBHjcIf{TJ*T>?KQz$Z-!6$8EDt)pSi9U?&n0%O} zBzso~v+!c5%ORkJIJ!Ulp`aI2Y`<`%arZD?q$GZHCoK&Y-1XLEB%d{bE+M=yz-YMV<>N*Y{M)6>@<-VCSC1)3zjS*%MP zA6I%HKX+A3F!97jSld;xF?};s1IY*oC0m=B8989;UQ)(cj6Oy`10Yc$R;GHf3KkbXf)V2gVD#kxl`N2R6$mlG5N)wWo z9a0_RWYg$)hXS|{Wwf-kVt_&Se&|LO*f#|c)V*IMkI5`?qdIN<|9aP<|3+*6hW;94 zW`v_o!k{cNiW-wbEoIGFSGSWGbVD`Et72&`8Y+3rn(-<(ZU9rxZfYP2DvU>J%On() zSkp)3P~zmx7zOL;aUd}L=-EJ|bcEG{A|aA5DTSDBv=uK4kC^p@YO7inL?uTBP!7K| z4_*ii3#WqjTz9!qQl^YtsE5e=8I6KCu3kxr4A~WIhvFX$ZjvrZPo|{r6H~Itrg!?n zJPuW{yp?9gkQQOWqcy#tqA%|&`YKX$Y4Ou+b~bE!sS*j8Cg@js_BoxKU`JLO>i@gi zdUn-u}U|4jJx`HSZLe>PfX-R9Ru1{RPga2J2CIth!jX1F;xzCk=@ZhiXJny~=; z1#MhJ($zl-)yCO1>(`vzD^%F7!@;sclA5_&Ovk(&B(`t2n}U5v>?5RP=2mpaMT@+> zQmR;rv}O;Jp|aNP-ReR&bFk#k{kK|EKPCdmAeH>k%U#4&(iWB}_~VB=+9~;(*Z`iB z^eGRoD;W23b@+fV*hb`5CnmKXam_tb{A~h^U8cv!WoS|#P^JR83+xIxBq#xOgGjc? zBn2Drzh(=TQMa>$k^0vRQXpom;PAc1S?uHaa9a=gZlfop_1qryIjMCw_Jfp6AXhyA zq8wn3=bO<{^MCKTB@#j?ayph_mFD-4F`#FxYF2p3Nf?`mcfMKtUFg&f6KBzT7q*IK z505Yvi;VX?iQQo6$heW<8bMy=${wc4uu60t)br@bw#?W-1bY>*HkJ+J-z=ofG z4h{SEVdF17=J$-sdhX)ov&dH9c7O4q_)vJ;FakL3DIAD?i;!MkI+q?b@O|fnx2_pE z5Lbe3nJn4i$umIJ9+fnhoSf;)i$LTRq+}|iSi@)T55B9xVBo@*bENVrp5B0HA7}qHhbV)D~%^y!s^`Dvvu1fP{%E@AS>(vH^uwJ$e(q4H? zL6xSpSWLxUm=`bdiN4R=Yi)VFoHG+FiwQZgXtR=&Z(|D4mXkDn-h zR6oMt7QX!t5x4P{?OIOK6SFd@EjyR5VKjts+JYRaCN0Gy;Wk9`!*YW;pQt!o45NrJ6ocJ)m6%qxj+I|#rvw~D# zvdo88zg-su)Yn^$8#W^EB$$gH!(cI`q%!?RIh}C1CY&9m62ofeCoV${34<;3G_oA2 zN`(`ZQ52E7(p0zzNS_iz(L%e9V4%@7+Dlmk3g{`h=r#`vt8Vj(ujIrzU8*>EMzNZj z8iEjZvOBx2{W0K6_>t^qlQGbT&b1U0BG>VTn6sjTh<#2S@ie(*y03=m&TCUHiHK+q zDcg#E*3M*l<(M01NV22-llk|5?DPc1t$yu1YPDz^WIP)XORTY5&mA;73$C)yiv{rm za&oZ@o3}}thP#_A5U0GpS2P(~k#-G(XsIxt$~ltw=R)rJ3-JeNf2qO+#D*N1R5&z6fQ?;@GIH`f;IY;W6QZJ-C;SRfR<2$(>9a)6j$& zIhQ%_G!la9Cv@6pUJ9$hNOna+aESoM)90$W*`$GgTX`5PtWAQ z9(5?Ccz4PrRKjpg(UvRXj(&Zov+Ecn(}}IW5+=GRq_HwT(o@vhMQB@~J)kN6GMDr# z{qvX|!8iQXJr%I*@J@v3t%)h@Zrj%`*c;eKnPbUv!w$c?-9z9xuU+GOJ3)TKIZ)1~ zg(SETJS)O43`UXE14Iwb-AE%}pvbk5z)f(&cnd+z&MFEr{qYwx#LI8P>GdIr* zuQM}1n}2wOh{(c9QV9UyxUaU#ZP)aQ7QhJa& zH?6<7w<|rLMoAE$Vq<$2nR#Ptp4v1&U-FTcrqq@fZyb@9cni|C)RW3iQTx|fy zv2puLXzs;CzPJ;siIqVfl0#hqYVy9}M|T!oY29GGe4Z*3lXrK8+)T1@ zCe^jUEMaIFi}4cOn~tCPHu~GRn?1`FKYIUnS5x+MLOswkaGss>x~`DnS?uMm>r)`G zVFEP23K$TnihQOmkv#BZWjiy~0V-_47zfTg? zkQ(6FzBOhk2Ij;H3?iNecbuO|CV1J$8wXUt7DF5ZB$sduPDgOMBlNG?`VIuzb7srm!IVz%+dTW5uvJaM!qjG_7 zzu`=}!T*nJ*R_w%Jo}Uv2}IQfW&JKFE~=#rSGR@3wN*8>5%8<3s@kfma(!hFvz`lz zJNy^SHb?T+PfmqUlw+vZ?ND#+P<()QNa*c=-;cpn;Rt2b|I%|JR#)oZIm}R2M%767 G*#84vf*pkb literal 4114 zcmb7{XHXMdv&RD>Pe70&p_c$b>Agch2w*@#k|-#>Bhq`9A{aWMgAh@gzylaM2vS0e z(m^Q(#Xuwkq=|IJ%l-1s+?jhn+&O3WKj-ZHW@paq?3_(DH@n5m$jb--0GN&82FMGo zxUh8~{e^dwyK8YFU}ree6aa|04gka^005^KSF!5=K(IUju;BmzXchthTz(~Q5!x34 zdZ*jB3;=)sd%b-3ItKt?xom8pcQ5So78aVZq{%*VI~A(`&kk^S?P;=Gd1wN7?{$H_u}&$)~d zj{$}Vj{pC*YVx}Q&N^^7fqI?)oxsKdEJ3)2;NT|dl}!;7*F#cC^pW@qqhU5!E%Cn8 zP1jWG62Z6>*4GIJHjI@8K$*~7%rd)0Y(xPQiH>DXaV3bbt)GTPg%5D_u0EH>lUX5X z)@8FN5f?A?{rd~yO)B`?8kUv;UvbV^0%NIXH6;idrqNsGeq6Sf%FUsYeG^WcL90yW z?nAYbO(x~+kW}uxh-yP)VK|$UGAY79oS3B}Zn$WT5gDxh2owA8BL1F&8GWL7mnNj0 z8z%6a4Ie6gC-7)G!qVf-k7U1*qKF06CB4@aKlAoDe;);(nSh9}ka-!oqn)|gfiFJ; z{yx=;Rt1KkV|7_~7n`>PLQes9y{zwgHlg}${9^I;X@K2F_``^Zj#aaA8k(&Z?T9vA zcm9m{wcsy9!eX7yvDSbvJGn}^#CGW0jw{KGW zlh^^VHia3Y=QnQ>FUwKMvN!>YM+^C0+Zg1M!YkN5(6=nA{e@r}aA!&WtI5j@0JH7{ zG0KUFoZjnvX=+5wx_DdC7~@U}B-;A8F4K001OU2W`o`X4cjf+?ntnD~nxjj>aQkBa z*w0Fo7p8-YsnwNWL#6{8#Y0H~RDoButlLFg+b*1nB|?K|VXC9wk|w`pC|p-x%@a@L z2;3KbStV?p!hI!-4)EYEOC|s?I{HV5a^!u^_|He!(qSk6_%T=PO05Sz!f0Ee- z)7g&tk-2|n1TiY9-%Xl|v}0+XQ>bDl*7GCb)5`sv-wFX*JeAJPZV%a2)^ji z4AFv=8U6$u(#ZO_IkWG%AL^gZ|v@jEMm4@BFqZ}Seyi5eUK6K_`*MAhk zOE)1I3X^6n|MSNfiu$gB6E(MSt%&a)zHLi7rO zp9?;aWhTD&U|(vKm@~?QnJ~_$Fg+GiFeMze2ubJ@j|PM57s;kbt)_gWp5P*Hpnl_F zo03EboO#|PiPz)KwI&*ZrZUIaRHHPyZl(=2sSZp>sJKK%Kd8!x_17kYl^h)>$o-CF_(c)Jp24{hinL->>H$%RmYxT-FB1Bd0YRCe%|)j7kWP?2Z-VH z@$vaarBXHfttry=4o8e*NBiEm25#Ldf$fy>*{J{>_`~09d!Wr)RhO73fu1*%{Yh`uz zV41E>lAv3kiR2IPx5G(~e)^ZIN^vWtyR&ogUel*Ja#Z$q9`~1^=h_RKR!!3La?S6< zgA*ehqT=YX+6Hf!%zG3XQiF|3`Pw*~%Z>?hamF1;)Mi<6dXLE!jdZ~4G|h5jPw{(^ zKR0B=CAJIV>Ga-0I;%yIZ^XZtzoTgKPjZJ2t+O+JQcy4n?&W|m&fE%cJT*A_^^0SR zHB7PqFQ!IWxH6*CzC_n=^B;O|xK4p)fOUk> z>=o%d?kh{B+2t$MEBpS{sxC~j3bfT=?|YbC$>D=v=D$~;tGqn8i_nwAt0#ap2K=Qm zR$exTJZ`8eTPzEL?MFm7>`Wcgak0I6zZ|rh)y$wseWF#W-f2Khk)36DeQoVdyp3FN zGKK5G4vnPYda*;6N~4Gx#~Y!Zo~pC`ox^~f<=Xtd-`?>Cm%U1NCHMV- z`BZ?rn~t7S)Sube+53saO?8~_&F0yVqGle}m7gb}ZOTVZRTylVl!=n%OrX2d`?|fl z(#w0v(-qSWXv$&{3e(Zd>?nG3na-}(+R0nttvzGcyY;3g$C{O}39cqo-@KY-uFc@! zy6ofx2UIC_-jVgr(pk6tu7^|22u3#rcGy54aAAMcN4W6`_oX;|)pPP*i{VBpzS|9;4a z8?*Td9tDf|L+NzK7Z6!<0(#VDt8j#a?l3* zkv#oHj^l+p3vnOF&L?+W z#CGq@+-Uv)*pHtlN8|2MrJ4MJ$D~poIv#qcTqNJkZd)EJd%ZEzVL}+)TA@u`A`#iX zvy}r+_2XmTkj{}Y3WcAtCQ`fB7zfo};jw!;@`%uN925;Zq<{5U%u`cQqf`hxEzsoY z+p$)nLQ<-9UUjCQ&X9(Go=VV)vF@P#z-CgOF^+SzhJ`R6w{`R#3otUI{lI9GPV>a} z@=WWTbIwlKc&stnWMKV++{QBxH@ACwDT3Sn5^QF%b2 z%7$%j+ylMr_$3DO0%bS{WWGJW`RPcw4?z{P>}Dl)fQ%?XUnUiRlb3fmR8370s`>9|ZR&Y&)fa4b!AO9_Cm~_sbAKz##(U z*haOi0^V4GbnHbANV6Mn6H)^ARf(-WX6W2sL%G9_z2Zy4#r&gLLzbs(y^VG8{1v7n zG}iro_7-IJ3OX?p_yC+LLh=*lb66d7lCt;0YYu$MNXb{bFRsgyd)xDN!#$@v1oiMm z9P`=l6QW#k?{dsp_`|EVh-p=Ko|;;GpQ0Fl{IA*%An`tn3V`HCs7XTmrIRqotq!Z` zmC+&4znO*RGXAMo77PB;RzSGwPWdMI- zpDTNztl>F+wy9!fHJop034XnSyo3)_%qk|uM*MP(Ey-W_Uo9j$m$e~J8*?1R+XOVBIiisaMAW3$rEbJ{n>1s%)>dJ3Cn=pUQ ziIbza)UyWhXM&{LgY^xvqNZcPtbw=dMm0=LN1Iz=^fF77XB!yQl(JXzS3G#y7-aYS ziXsJZeFL-A-#_^Yi9u{~u3*Yrg>q)oCbSgB@v4ghRbOMyc%tDo>Cb)!O+|EWB6W(J zU&QBUWPR+CWte3yy`fPCqXpD0d;^P(z)!})ORu{UYvV0q&ol8-ptU}j&a?F?mWZ~+ zP5si*%SZE;1-|nb+iTg*STHlyS{`>*Nw>M3#Vx8W*X?TOyiOfk*4+|~k>W4Ht>5iF} z{zG4_f0(4(%Z&MEk|5WIIY#9b1Jf=&o_pxrhhOf ze@g#H=%<1K`iVTQyWN*zy}Q_Tb7!T=M+9ChxSgk1l8c+%ji-b2jhQXJzRayt#jkft z@V>pq#I=?D6Bs|(7vN><1^u{VZ!@RjP59wCUz4EUlL1?cE7}aqXb((VS#GQGPbV)+ z*SY%gE51sWf2+k?c0D%k`@&l*kr6VNi!UW59cE;pk;=_%hj4OOJPP%s9if0A_qk04 z_)9C?1wMKvDo*Iu(8X9@!RyEdQV$*gd)qaUu zPFo*(cA2#|TOZqF6SUy2-SQjszl@|s*uR(LY=*wP84%~X7?H(-3?Br!I0m_DItRF3 z2tZL@QAI{xNk&2Ko}!Ybl8UC1l9ar>ro22YhxWn$0K9!&Jlw+nZy?Y(!T16Y|4)V> e4{z7NAV+V%|C@o>ROVkW0AoWlg9d$v`2PYs(3!3P 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 c70aabb18d0ff82f018841d00957ea81eb2f3768..11b9d64740ec9d47f5b80e8e6587e7e8896bd348 100644 GIT binary patch delta 3786 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�GM5yHV16;R0kHJCM{re-b_^yXy2Oa$WIM3av^%mT0P zE*DF*YcCcpzmZHV{%`br|1A>Y*)e^S8djZ|!p6_5D2q_BR!~$|ysoaOD1Ggk`n79k mz?yrR&HsDmXB=ysxy2?V{y+9$c4gUszh!J-rcc&$ivADY-g^E3 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_mk6_complex/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png b/sprites/spr_mk6_complex/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png index 54409ebc5192a6042a92da726555d9449e08ef2d..b4bacfd0c5357e32cde2794a024d7a358f3483e7 100644 GIT binary patch delta 4921 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 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 54409ebc5192a6042a92da726555d9449e08ef2d..b4bacfd0c5357e32cde2794a024d7a358f3483e7 100644 GIT binary patch delta 4921 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 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_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 04baa11cca51ae54965eadf807e7251058fa8748..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 817 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^G|c=uhkb*}?^1^9jcXZ!+EKwoz1`vmy!#gHpZu?KdA!2f zt=IaJ4Nji^t3LPL&*jkq<-F{bul*KiMtN-Hm}eE0t!s5^^=ymnW{M}Ima$b%RrGPZ zCb%#6e`@*+d2Rb1slLb8P2#?o{!lyNq}Tm@vuq&Or1mg(O^71Y6?z3xe{;v{J*}H6s=834FKNAd#y|^X`KFs8rq_=t55(P=oS<4h&?|ic_ zGyd$1NlhxEjzWq#VO*0GFW%m!(0!_?uSe~~ETd-461?OD!#Tb7^xskIAt zEBtTNx%__V)^~9X5C2&?POG@4_T=YO4nfpdp*k<>H`8rF?~J^=`tPq1_o9J24A?Qc%f*>%}>cptHiCLHC*Q# jP=f~ChLX(O)Z&uF+ydNsE;;dPf_&`h>gTe~DWM4fG+YsF 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 04baa11cca51ae54965eadf807e7251058fa8748..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 817 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^G|c=uhkb*}?^1^9jcXZ!+EKwoz1`vmy!#gHpZu?KdA!2f zt=IaJ4Nji^t3LPL&*jkq<-F{bul*KiMtN-Hm}eE0t!s5^^=ymnW{M}Ima$b%RrGPZ zCb%#6e`@*+d2Rb1slLb8P2#?o{!lyNq}Tm@vuq&Or1mg(O^71Y6?z3xe{;v{J*}H6s=834FKNAd#y|^X`KFs8rq_=t55(P=oS<4h&?|ic_ zGyd$1NlhxEjzWq#VO*0GFW%m!(0!_?uSe~~ETd-461?OD!#Tb7^xskIAt zEBtTNx%__V)^~9X5C2&?POG@4_T=YO4nfpdp*k<>H`8rF?~J^=`tPq1_o9J24A?Qc%f*>%}>cptHiCLHC*Q# jP=f~ChLX(O)Z&uF+ydNsE;;dPf_&`h>gTe~DWM4fG+YsF diff --git a/sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy b/sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy deleted file mode 100644 index 27d6923907..0000000000 --- a/sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy +++ /dev/null @@ -1,111 +0,0 @@ -{ - "$GMSprite":"v2", - "%Name":"spr_mk7_complex_left_pauldron", - "bboxMode":0, - "bbox_bottom":81, - "bbox_left":105, - "bbox_right":152, - "bbox_top":28, - "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",}, - ], - "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,}, - ], - "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, - }, - "origin":9, - "parent":{ - "name":"mk_7_complex", - "path":"folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", - }, - "preMultiplyAlpha":false, - "resourceType":"GMSprite", - "resourceVersion":"2.0", - "sequence":{ - "$GMSequence":"v1", - "%Name":"spr_mk7_complex_left_pauldron", - "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_mk7_complex_left_pauldron", - "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":"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,}, - ],"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":-2, - "yorigin":0, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"MarineViewer", - "path":"texturegroups/MarineViewer", - }, - "type":0, - "VTile":false, - "width":164, -} \ No newline at end of file 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 ac8421653738e165a745932150aefd38ee99c929..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1227 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^-4Tyt1)!u|XAH^1L<`|YOd{j4S22SrX) zEzz4$yy}TTN%F%pYxkxaux^rTckl~6S@&UCRH@zq;e&gk{OV#~cShu=1leu6|DHcS zcx^UW&wk^bYd!bN?psmfY$sdP}eTRa&ycY3Y?s zuO})g?c29cN$Jt&&&InmbV_2o?Mw^Hv-7X++xn);L{RYj`SX*zZ*8-!`C1xkP=5Qy z<1ewRYgbPw_58bb{zk2v(^q#Cv(4XVI(^*~rpW1w|DLdHeDj(;+agt;^WFS_I2G%* zS?rhOBYrXao1ZCpCX;@wwN2*ugwjaahC7C7dE6^@@2lT`?v}9aGL9$Ar+Llq{!1;t zZLoy-=w!_a{CPT4{@!kzuB;cX%DO2@Utix8qe^_FS2FDR2ASOP9AfTzkE2IUnEcij~`RC(K!!d;8JaXodF&w)QC(KdVzo(ra9@ zCG_}2rpTSqJZ8ytb#-C(Z4TFRg)?J5{crOVJYijU`tga5dOOC-vfE-FT{quld_DD08eUZB$8x_iyE+V~)sBd=e-KG|CARME@8 zw{il%hWIh>E%%E#o-|9eeGt2v&(~PPpgcMM2piLmpW;Wdl6PMW-E&>*$=}sV9cbBu z+FXH;^1JhvsWk1qv>Ir%YKdz^NlIc#s#S7PDv)9@GB7gLHL%n*Gzc*;v@*7|GP2Y* zFt9Q(DAW=3LD7(#pOTqYiCY6h;mQv{4H|G8N-}d(i%Sx73vlZRPwCJHdDzp{&t;uc GLK6V65cDDd 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 7e08510be6f8b47f77fba2bcc246f3bc6b837784..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1043 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^g`H~hwy!B^zG!F{`jX?zt-rMhSFYw4J znfuWG{X=mN7ndbd9;KdV&D&lP|GW6Tx!Iqlh^^KWytNr+mAIXCn&g*ubm&Z3&mZ@@ z{Pj`shi_(e#@ptflL+dXuJcCo*4Z_)S5Els(JE@ReP@*0m$fsPEc<6U=;d-{h@H7y zq%`64iRUM7IXvq+R9U9MS|nGga9@7UyYt6h|C2al?ELfh3u%Krdv2|3GhSNpQ~s0) zdwWpp9B(`Ked7Q8H+NOKEiHLtynY$`)0w+JzkHPOLO|_P*Z(U#Adwlm#=T%F%Ea%U%{4{Y=*Uz<4a-phkH=Wdec8xdSbL@7Y%r()Xvrz{A zD<`F$*eSd9vff-{WvTO%m@Mbto~wUb?(J>1V!8J_tbJfF`Z-U{%lrT zkV0nebs5bGlV9)H_;cA&AglQG-i<#mtO05({W3>cd0*S6UAf#UzHf7HGgUI)l(7t& zx&|1w(y4thtFmr0c@|gS+U9WS*1B!F6T}TKRi>mB1D%>Jk=M5dsNtmGs@vNfinjOy z9k+h@_sA#9XMxli-8i;vRW83dPw?6=?jQL}qy0k)&;5~+znb?wIV|=C%cP|0)$tc? ztM+@&`jv6pcaGozRnbWu7R&x#6F8xMb@8vMK+3@Dt9DfOd)5ng_Hq_=osVkWvrn^$ z12w%-ohSI8;bc_1Rb|{d5un+sC9V-ADTyViR>?)FK#IZ0z{phBz*yJ7EX2UT%GlV- zz(gC!FfcImXwO5@kei>9nO2EggM+C3C7=ckxD6$lxv9k^iMa*1^@uab@q&Ep>FVdQ I&MBb@0FwZSt^fc4 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 ac8421653738e165a745932150aefd38ee99c929..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1227 zcmeAS@N?(olHy`uVBq!ia0vp^OMv(V2OE$~)b|eqQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^-4Tyt1)!u|XAH^1L<`|YOd{j4S22SrX) zEzz4$yy}TTN%F%pYxkxaux^rTckl~6S@&UCRH@zq;e&gk{OV#~cShu=1leu6|DHcS zcx^UW&wk^bYd!bN?psmfY$sdP}eTRa&ycY3Y?s zuO})g?c29cN$Jt&&&InmbV_2o?Mw^Hv-7X++xn);L{RYj`SX*zZ*8-!`C1xkP=5Qy z<1ewRYgbPw_58bb{zk2v(^q#Cv(4XVI(^*~rpW1w|DLdHeDj(;+agt;^WFS_I2G%* zS?rhOBYrXao1ZCpCX;@wwN2*ugwjaahC7C7dE6^@@2lT`?v}9aGL9$Ar+Llq{!1;t zZLoy-=w!_a{CPT4{@!kzuB;cX%DO2@Utix8qe^_FS2FDR2ASOP9AfTzkE2IUnEcij~`RC(K!!d;8JaXodF&w)QC(KdVzo(ra9@ zCG_}2rpTSqJZ8ytb#-C(Z4TFRg)?J5{crOVJYijU`tga5dOOC-vfE-FT{quld_DD08eUZB$8x_iyE+V~)sBd=e-KG|CARME@8 zw{il%hWIh>E%%E#o-|9eeGt2v&(~PPpgcMM2piLmpW;Wdl6PMW-E&>*$=}sV9cbBu z+FXH;^1JhvsWk1qv>Ir%YKdz^NlIc#s#S7PDv)9@GB7gLHL%n*Gzc*;v@*7|GP2Y* zFt9Q(DAW=3LD7(#pOTqYiCY6h;mQv{4H|G8N-}d(i%Sx73vlZRPwCJHdDzp{&t;uc GLK6V65cDDd diff --git a/sprites/spr_mk7_complex_left_pauldron_shadow/spr_mk7_complex_left_pauldron_shadow.yy b/sprites/spr_mk7_complex_left_pauldron_shadow/spr_mk7_complex_left_pauldron_shadow.yy deleted file mode 100644 index f94af43cf3..0000000000 --- a/sprites/spr_mk7_complex_left_pauldron_shadow/spr_mk7_complex_left_pauldron_shadow.yy +++ /dev/null @@ -1,112 +0,0 @@ -{ - "$GMSprite":"v2", - "%Name":"spr_mk7_complex_left_pauldron_shadow", - "bboxMode":0, - "bbox_bottom":81, - "bbox_left":105, - "bbox_right":152, - "bbox_top":28, - "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",}, - ], - "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,}, - ], - "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, - }, - "origin":9, - "parent":{ - "name":"mk_7_complex", - "path":"folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", - }, - "preMultiplyAlpha":false, - "resourceType":"GMSprite", - "resourceVersion":"2.0", - "sequence":{ - "$GMSequence":"v1", - "%Name":"spr_mk7_complex_left_pauldron_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_mk7_complex_left_pauldron_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":"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,}, - ],"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":-2, - "yorigin":0, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"MarineViewer", - "path":"texturegroups/MarineViewer", - }, - "type":0, - "VTile":false, - "width":164, -} \ No newline at end of file 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 652239c39b6e79e3aaea032ded95733967525c3d..d9799e5b8ee8956e32aff3294c7b0c581a8b7880 100644 GIT binary patch delta 116 zcmdnaww-OmMkY5SlMo{#D?>9YQ*&(t11kfA$bEJy3=9maC9V-ADTyViR=N2pnQ4^_ pMg~Tvx(1fI7#cJlx6PRRok?C1L#F=Qa(AFn44$rjF6*2UngCBRAR7Px delta 116 zcmdnaww-OmMkY5ygAfBFD?9YQ*&(t11kfA$bEJy3=9maC9V-ADTyViR=N2pnQ4^_ pMg~Tvx(1fI7#cJlx6PRRok?C1L#F=Qa(AFn44$rjF6*2UngCBRAR7Px delta 116 zcmdnaww-OmMkY5ygAfBFD?9YQ*&(t11kfA$bEJy3=9maC9V-ADTyViR=N2pnQ4^_ pMg~Tvx(1fI7#cJlx6PPr$|A3bAyfZtxjWD(22WQ%mvv4FO#p~HAQ}Jw delta 116 zcmey$@s(r4duBI7gAgM_D-$y-Q%h|F11kdqr|pxzF)%QwmbgZgq$HN4TIJ@aWTsUz p7#SFu>Ka(;VrVdarR6o*lto?9YQ*&(t11kfA$bEJy3=9maC9V-ADTyViR=N2pnQ4^_ pMg~Tvx(1fI7#cJlx6PPr$|A3bAyfZtxjWD(22WQ%mvv4FO#p~HAQ}Jw delta 116 zcmey$@s(r4duBI7gAgM_D-$y-Q%h|F11kdqr|pxzF)%QwmbgZgq$HN4TIJ@aWTsUz p7#SFu>Ka(;VrVdarR6o*lto?