diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index b5811bf7dd..227a018050 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -579,7 +579,7 @@ "isEcma":false, "LibraryEmitters":[], "MetaData":{ - "IDEVersion":"2024.1400.0.904", + "IDEVersion":"2024.1400.0.901", }, "name":"ChapterMaster", "resources":[ @@ -1295,7 +1295,9 @@ {"id":{"name":"spr_indomitus_complex_psy_hood_cables","path":"sprites/spr_indomitus_complex_psy_hood_cables/spr_indomitus_complex_psy_hood_cables.yy",},}, {"id":{"name":"spr_indomitus_complex_psy_hood_crown","path":"sprites/spr_indomitus_complex_psy_hood_crown/spr_indomitus_complex_psy_hood_crown.yy",},}, {"id":{"name":"spr_indomitus_complex_psy_hood","path":"sprites/spr_indomitus_complex_psy_hood/spr_indomitus_complex_psy_hood.yy",},}, + {"id":{"name":"spr_indomitus_complex_shadows","path":"sprites/spr_indomitus_complex_shadows/spr_indomitus_complex_shadows.yy",},}, {"id":{"name":"spr_indomitus_complex","path":"sprites/spr_indomitus_complex/spr_indomitus_complex.yy",},}, + {"id":{"name":"spr_indomitus_head_variants_shadows","path":"sprites/spr_indomitus_head_variants_shadows/spr_indomitus_head_variants_shadows.yy",},}, {"id":{"name":"spr_indomitus_head_variants","path":"sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy",},}, {"id":{"name":"spr_indomitus_knightly_robe","path":"sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy",},}, {"id":{"name":"spr_indomitus_left_arm_bionic","path":"sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy",},}, @@ -1305,12 +1307,15 @@ {"id":{"name":"spr_indomitus_left_leg_bionic","path":"sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy",},}, {"id":{"name":"spr_indomitus_left_shin_shadow","path":"sprites/spr_indomitus_left_shin_shadow/spr_indomitus_left_shin_shadow.yy",},}, {"id":{"name":"spr_indomitus_left_shin","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},}, + {"id":{"name":"spr_indomitus_leg_variants_shadows","path":"sprites/spr_indomitus_leg_variants_shadows/spr_indomitus_leg_variants_shadows.yy",},}, {"id":{"name":"spr_indomitus_leg_variants","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},}, {"id":{"name":"spr_indomitus_right_arm_bionic","path":"sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy",},}, + {"id":{"name":"spr_indomitus_right_arm_shadows","path":"sprites/spr_indomitus_right_arm_shadows/spr_indomitus_right_arm_shadows.yy",},}, {"id":{"name":"spr_indomitus_right_arm","path":"sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy",},}, {"id":{"name":"spr_indomitus_right_eye_bionic","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},}, {"id":{"name":"spr_indomitus_right_knee_crux","path":"sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy",},}, {"id":{"name":"spr_indomitus_right_leg_bionic","path":"sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy",},}, + {"id":{"name":"spr_indomitus_right_shin_shadows","path":"sprites/spr_indomitus_right_shin_shadows/spr_indomitus_right_shin_shadows.yy",},}, {"id":{"name":"spr_indomitus_right_shin","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},}, {"id":{"name":"spr_ingame_menu","path":"sprites/spr_ingame_menu/spr_ingame_menu.yy",},}, {"id":{"name":"spr_inspect_small","path":"sprites/spr_inspect_small/spr_inspect_small.yy",},}, @@ -1649,6 +1654,7 @@ {"id":{"name":"spr_sw_mk7_helm","path":"sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy",},}, {"id":{"name":"spr_sword_pendant","path":"sprites/spr_sword_pendant/spr_sword_pendant.yy",},}, {"id":{"name":"spr_tartaros_arms","path":"sprites/spr_tartaros_arms/spr_tartaros_arms.yy",},}, + {"id":{"name":"spr_tartaros_chest_shadows","path":"sprites/spr_tartaros_chest_shadows/spr_tartaros_chest_shadows.yy",},}, {"id":{"name":"spr_tartaros_chest","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},}, {"id":{"name":"spr_tartaros_colors","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},}, {"id":{"name":"spr_tartaros_complex","path":"sprites/spr_tartaros_complex/spr_tartaros_complex.yy",},}, @@ -1667,6 +1673,7 @@ {"id":{"name":"spr_tartaros_right_arm","path":"sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy",},}, {"id":{"name":"spr_tartaros_right_leg_shadows","path":"sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy",},}, {"id":{"name":"spr_tartaros_right_leg","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},}, + {"id":{"name":"spr_tartaros_right_trim_shadows","path":"sprites/spr_tartaros_right_trim_shadows/spr_tartaros_right_trim_shadows.yy",},}, {"id":{"name":"spr_tartaros_right_trim","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},}, {"id":{"name":"spr_tartaros_shadows","path":"sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy",},}, {"id":{"name":"spr_tartaros_wep_fix","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},}, @@ -1734,8 +1741,10 @@ {"id":{"name":"spr_weapon_boarding","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},}, {"id":{"name":"spr_weapon_bolter","path":"sprites/spr_weapon_bolter/spr_weapon_bolter.yy",},}, {"id":{"name":"spr_weapon_boltpis","path":"sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy",},}, + {"id":{"name":"spr_weapon_boltstorm_gauntlet_shadows","path":"sprites/spr_weapon_boltstorm_gauntlet_shadows/spr_weapon_boltstorm_gauntlet_shadows.yy",},}, {"id":{"name":"spr_weapon_boltstorm_gauntlet_small","path":"sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy",},}, {"id":{"name":"spr_weapon_boltstorm_gauntlet","path":"sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy",},}, + {"id":{"name":"spr_weapon_chainfist_shadows","path":"sprites/spr_weapon_chainfist_shadows/spr_weapon_chainfist_shadows.yy",},}, {"id":{"name":"spr_weapon_chainfist_small","path":"sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy",},}, {"id":{"name":"spr_weapon_chainfist","path":"sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy",},}, {"id":{"name":"spr_weapon_chaxe","path":"sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy",},}, @@ -1766,6 +1775,7 @@ {"id":{"name":"spr_weapon_knife","path":"sprites/spr_weapon_knife/spr_weapon_knife.yy",},}, {"id":{"name":"spr_weapon_lasca","path":"sprites/spr_weapon_lasca/spr_weapon_lasca.yy",},}, {"id":{"name":"spr_weapon_lightning1","path":"sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy",},}, + {"id":{"name":"spr_weapon_lightning2_shadows","path":"sprites/spr_weapon_lightning2_shadows/spr_weapon_lightning2_shadows.yy",},}, {"id":{"name":"spr_weapon_lightning2","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},}, {"id":{"name":"spr_weapon_mace_of_absolution","path":"sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy",},}, {"id":{"name":"spr_weapon_mars_hbolt","path":"sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy",},}, @@ -1784,6 +1794,7 @@ {"id":{"name":"spr_weapon_powfist_old","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},}, {"id":{"name":"spr_weapon_powfist","path":"sprites/spr_weapon_powfist/spr_weapon_powfist.yy",},}, {"id":{"name":"spr_weapon_powfist2","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},}, + {"id":{"name":"spr_weapon_powfist4_shadows","path":"sprites/spr_weapon_powfist4_shadows/spr_weapon_powfist4_shadows.yy",},}, {"id":{"name":"spr_weapon_powfist4","path":"sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy",},}, {"id":{"name":"spr_weapon_powmace","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},}, {"id":{"name":"spr_weapon_powmaul","path":"sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy",},}, diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index ca9f15a2c4..045a59e2f6 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -1329,23 +1329,15 @@ function ComplexSet(_unit) constructor { break; case "Terminator Armour": add_group({ - armour: spr_indomitus_complex, - left_arm: spr_indomitus_left_arm, - right_arm: spr_indomitus_right_arm, backpack: spr_indomitus_backpack_variants, chest_variants: spr_indomitus_chest_variants, - leg_variants: spr_indomitus_leg_variants, - head: spr_indomitus_head_variants, belt: spr_indomitus_belt }); armour_type = ArmourType.Terminator; break; case "Tartaros": add_group({ - chest_variants: spr_tartaros_chest, mouth_variants: spr_tartaros_faceplate, - left_trim: spr_tartaros_left_trim, - right_trim: spr_tartaros_right_trim }); armour_type = ArmourType.Terminator; break; diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 875d72d845..8b24b11d83 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -699,6 +699,11 @@ global.modular_drawing_items = [ sprite : spr_mk7_complex_crux_belt, body_types :[0, 2], position : "belt", + offsets : { + "Tartaros" : { + x : 7 + } + }, armours : ["MK5 Heresy", "MK6 Corvus","MK7 Aquila", "MK8 Errant", "Artificer Armour", "Tartaros"], exp : { min : 100, @@ -708,6 +713,11 @@ global.modular_drawing_items = [ sprite : spr_crux_belt_fancy, body_types :[0, 2], position : "belt", + offsets : { + "Tartaros" : { + x : 7 + } + }, armours : ["MK5 Heresy", "MK6 Corvus","MK7 Aquila", "MK8 Errant", "Artificer Armour", "Tartaros"], assign_by_rank : 3, exp : { @@ -1121,14 +1131,6 @@ global.modular_drawing_items = [ body_types: [0], shadows : spr_mk8_gorgot_shadows }, - { - position: "right_shin", - body_types: [2], - sprite: spr_indomitus_right_shin, - armours : ["Terminator Armour"], - // shadows : spr_indomitus_left_shin_shadow - flip : true, - }, { position: "right_shin", body_types: [0], @@ -1429,6 +1431,47 @@ global.modular_drawing_items = [ body_types : [0], flip : true, }, + //Indomitus Sprites + { + position : "armour", + armours : ["Terminator Armour"], + sprite : spr_indomitus_complex, + shadows : spr_indomitus_complex_shadows, + body_types : [2], + }, + { + position : "head", + armours : ["Terminator Armour"], + sprite : spr_indomitus_head_variants, + shadows : spr_indomitus_head_variants_shadows, + body_types : [2], + }, + { + position : "right_arm", + armours : ["Terminator Armour"], + sprite : spr_indomitus_right_arm, + shadows : spr_indomitus_right_arm_shadows, + body_types : [2], + flip : true, + }, + { + position : "right_leg", + armours : ["Terminator Armour"], + sprite : spr_indomitus_leg_variants, + shadows : spr_indomitus_leg_variants_shadows, + body_types : [2], + }, + { + position: "right_shin", + body_types: [2], + sprite: spr_indomitus_right_shin, + armours : ["Terminator Armour"], + shadows: spr_indomitus_right_shin_shadows, + flip : true, + }, + + + //Tartaros Sprites { position : "armour", armours : ["Tartaros"], @@ -1476,6 +1519,21 @@ global.modular_drawing_items = [ [spr_blank, spr_blank,spr_blank,spr_tartaros_leg_rivets], ], }, + { + position : "right_trim", + armours : ["Tartaros"], + sprite : spr_tartaros_right_trim, + shadows : spr_tartaros_right_trim_shadows, + body_types : [2], + flip : true, + }, + { + position : "chest_variants", + armours : ["Tartaros"], + sprite : spr_tartaros_chest, + shadows : spr_tartaros_chest_shadows, + body_types : [2], + }, ]; @@ -2534,8 +2592,11 @@ base: { }, variants: [ { - sprite: spr_weapon_powfist4 + sprite: spr_weapon_powfist4, + shadows : spr_weapon_powfist4_shadows, + }, + { sprite: spr_weapon_powfist, body_types: [0, 1], @@ -2555,7 +2616,8 @@ base: { }, variants: [ { - sprite: spr_weapon_lightning2 + sprite: spr_weapon_lightning2, + shadows : spr_weapon_lightning2_shadows, }, { @@ -2581,6 +2643,7 @@ base: { }, { sprite: spr_weapon_boltstorm_gauntlet, + shadows : spr_weapon_boltstorm_gauntlet_shadows, body_types: [2], weapon_data: { display_type: "terminator_fist", @@ -2617,6 +2680,7 @@ base: { }, { sprite: spr_weapon_chainfist, + shadows : spr_weapon_chainfist_shadows, weapon_data: { display_type: "terminator_fist", }, diff --git a/sprites/spr_cata_belt/spr_cata_belt.yy b/sprites/spr_cata_belt/spr_cata_belt.yy index e895943f0e..ff32a3ce58 100644 --- a/sprites/spr_cata_belt/spr_cata_belt.yy +++ b/sprites/spr_cata_belt/spr_cata_belt.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_complex/spr_cata_complex.yy b/sprites/spr_cata_complex/spr_cata_complex.yy index ac3c37434e..2b3d81b69e 100644 --- a/sprites/spr_cata_complex/spr_cata_complex.yy +++ b/sprites/spr_cata_complex/spr_cata_complex.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy b/sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy index 4ec40c3f04..f1f9293844 100644 --- a/sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy +++ b/sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_cowl_trim_1/spr_cata_cowl_trim_1.yy b/sprites/spr_cata_cowl_trim_1/spr_cata_cowl_trim_1.yy index f977f634c4..7524737d02 100644 --- a/sprites/spr_cata_cowl_trim_1/spr_cata_cowl_trim_1.yy +++ b/sprites/spr_cata_cowl_trim_1/spr_cata_cowl_trim_1.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_gorget/spr_cata_gorget.yy b/sprites/spr_cata_gorget/spr_cata_gorget.yy index 89cffaeb00..9443230e1b 100644 --- a/sprites/spr_cata_gorget/spr_cata_gorget.yy +++ b/sprites/spr_cata_gorget/spr_cata_gorget.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_head/spr_cata_head.yy b/sprites/spr_cata_head/spr_cata_head.yy index c22b81ce75..e8bc23672f 100644 --- a/sprites/spr_cata_head/spr_cata_head.yy +++ b/sprites/spr_cata_head/spr_cata_head.yy @@ -81,7 +81,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy b/sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy index cb95a270e4..7ca1326d69 100644 --- a/sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy +++ b/sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":2, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_heavy_toe_right/spr_cata_heavy_toe_right.yy b/sprites/spr_cata_heavy_toe_right/spr_cata_heavy_toe_right.yy index 8e37792939..f58b24d997 100644 --- a/sprites/spr_cata_heavy_toe_right/spr_cata_heavy_toe_right.yy +++ b/sprites/spr_cata_heavy_toe_right/spr_cata_heavy_toe_right.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_left_arm/spr_cata_left_arm.yy b/sprites/spr_cata_left_arm/spr_cata_left_arm.yy index 880c536e97..c15011f2d9 100644 --- a/sprites/spr_cata_left_arm/spr_cata_left_arm.yy +++ b/sprites/spr_cata_left_arm/spr_cata_left_arm.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.yy b/sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.yy index a1ad2841b8..d012351b9c 100644 --- a/sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.yy +++ b/sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_left_knee/7d4772f4-ee86-4983-82a3-4b22204b7345.png b/sprites/spr_cata_left_knee/7d4772f4-ee86-4983-82a3-4b22204b7345.png index fc5f609d3c..bf38a7dca6 100644 Binary files a/sprites/spr_cata_left_knee/7d4772f4-ee86-4983-82a3-4b22204b7345.png and b/sprites/spr_cata_left_knee/7d4772f4-ee86-4983-82a3-4b22204b7345.png differ diff --git a/sprites/spr_cata_left_knee/layers/7d4772f4-ee86-4983-82a3-4b22204b7345/98c531ee-b2a0-4680-8f1d-9a3271f11bf3.png b/sprites/spr_cata_left_knee/layers/7d4772f4-ee86-4983-82a3-4b22204b7345/98c531ee-b2a0-4680-8f1d-9a3271f11bf3.png index fc5f609d3c..bf38a7dca6 100644 Binary files a/sprites/spr_cata_left_knee/layers/7d4772f4-ee86-4983-82a3-4b22204b7345/98c531ee-b2a0-4680-8f1d-9a3271f11bf3.png and b/sprites/spr_cata_left_knee/layers/7d4772f4-ee86-4983-82a3-4b22204b7345/98c531ee-b2a0-4680-8f1d-9a3271f11bf3.png differ diff --git a/sprites/spr_cata_left_knee/spr_cata_left_knee.yy b/sprites/spr_cata_left_knee/spr_cata_left_knee.yy index 08e12eb38e..47dcca1349 100644 --- a/sprites/spr_cata_left_knee/spr_cata_left_knee.yy +++ b/sprites/spr_cata_left_knee/spr_cata_left_knee.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_left_leg/30845d03-5630-4ea2-b874-e43d1c591f74.png b/sprites/spr_cata_left_leg/30845d03-5630-4ea2-b874-e43d1c591f74.png index 65f2d47970..886aff4abf 100644 Binary files a/sprites/spr_cata_left_leg/30845d03-5630-4ea2-b874-e43d1c591f74.png and b/sprites/spr_cata_left_leg/30845d03-5630-4ea2-b874-e43d1c591f74.png differ diff --git a/sprites/spr_cata_left_leg/layers/30845d03-5630-4ea2-b874-e43d1c591f74/c2171e14-c3fe-4232-ba2e-e302118f9cc4.png b/sprites/spr_cata_left_leg/layers/30845d03-5630-4ea2-b874-e43d1c591f74/c2171e14-c3fe-4232-ba2e-e302118f9cc4.png index 65f2d47970..886aff4abf 100644 Binary files a/sprites/spr_cata_left_leg/layers/30845d03-5630-4ea2-b874-e43d1c591f74/c2171e14-c3fe-4232-ba2e-e302118f9cc4.png and b/sprites/spr_cata_left_leg/layers/30845d03-5630-4ea2-b874-e43d1c591f74/c2171e14-c3fe-4232-ba2e-e302118f9cc4.png differ diff --git a/sprites/spr_cata_left_leg/spr_cata_left_leg.yy b/sprites/spr_cata_left_leg/spr_cata_left_leg.yy index 70fb257b41..1089d93a5c 100644 --- a/sprites/spr_cata_left_leg/spr_cata_left_leg.yy +++ b/sprites/spr_cata_left_leg/spr_cata_left_leg.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_left_trim/spr_cata_left_trim.yy b/sprites/spr_cata_left_trim/spr_cata_left_trim.yy index ecbf6af7c5..c694010f41 100644 --- a/sprites/spr_cata_left_trim/spr_cata_left_trim.yy +++ b/sprites/spr_cata_left_trim/spr_cata_left_trim.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":2, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_left_trim_1/spr_cata_left_trim_1.yy b/sprites/spr_cata_left_trim_1/spr_cata_left_trim_1.yy index 56a2a1b20a..ee5ad0779b 100644 --- a/sprites/spr_cata_left_trim_1/spr_cata_left_trim_1.yy +++ b/sprites/spr_cata_left_trim_1/spr_cata_left_trim_1.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":2, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_left_trim_2/spr_cata_left_trim_2.yy b/sprites/spr_cata_left_trim_2/spr_cata_left_trim_2.yy index df30880bdf..7e2fb31f50 100644 --- a/sprites/spr_cata_left_trim_2/spr_cata_left_trim_2.yy +++ b/sprites/spr_cata_left_trim_2/spr_cata_left_trim_2.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":2, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_right_arm/spr_cata_right_arm.yy b/sprites/spr_cata_right_arm/spr_cata_right_arm.yy index d3f4bf74ec..c0f3d6322d 100644 --- a/sprites/spr_cata_right_arm/spr_cata_right_arm.yy +++ b/sprites/spr_cata_right_arm/spr_cata_right_arm.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_right_armtrim/spr_cata_right_armtrim.yy b/sprites/spr_cata_right_armtrim/spr_cata_right_armtrim.yy index 96461e6d09..0cc79ef559 100644 --- a/sprites/spr_cata_right_armtrim/spr_cata_right_armtrim.yy +++ b/sprites/spr_cata_right_armtrim/spr_cata_right_armtrim.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_right_knee/494700cd-feb1-4f66-81c1-4dfc8f378e20.png b/sprites/spr_cata_right_knee/494700cd-feb1-4f66-81c1-4dfc8f378e20.png index 1078082e16..649e3de1f3 100644 Binary files a/sprites/spr_cata_right_knee/494700cd-feb1-4f66-81c1-4dfc8f378e20.png and b/sprites/spr_cata_right_knee/494700cd-feb1-4f66-81c1-4dfc8f378e20.png differ diff --git a/sprites/spr_cata_right_knee/layers/494700cd-feb1-4f66-81c1-4dfc8f378e20/7122732c-409f-4f69-9ad0-33318d42dfe5.png b/sprites/spr_cata_right_knee/layers/494700cd-feb1-4f66-81c1-4dfc8f378e20/7122732c-409f-4f69-9ad0-33318d42dfe5.png index 1078082e16..649e3de1f3 100644 Binary files a/sprites/spr_cata_right_knee/layers/494700cd-feb1-4f66-81c1-4dfc8f378e20/7122732c-409f-4f69-9ad0-33318d42dfe5.png and b/sprites/spr_cata_right_knee/layers/494700cd-feb1-4f66-81c1-4dfc8f378e20/7122732c-409f-4f69-9ad0-33318d42dfe5.png differ diff --git a/sprites/spr_cata_right_knee/spr_cata_right_knee.yy b/sprites/spr_cata_right_knee/spr_cata_right_knee.yy index b40bae0a6b..898983ebd3 100644 --- a/sprites/spr_cata_right_knee/spr_cata_right_knee.yy +++ b/sprites/spr_cata_right_knee/spr_cata_right_knee.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_right_leg/ecf75db7-6223-4712-8157-c822a10e1617.png b/sprites/spr_cata_right_leg/ecf75db7-6223-4712-8157-c822a10e1617.png index fa6fe28eaa..2b64eae7b7 100644 Binary files a/sprites/spr_cata_right_leg/ecf75db7-6223-4712-8157-c822a10e1617.png and b/sprites/spr_cata_right_leg/ecf75db7-6223-4712-8157-c822a10e1617.png differ diff --git a/sprites/spr_cata_right_leg/layers/ecf75db7-6223-4712-8157-c822a10e1617/f2501eb8-3d15-489b-9adf-21790df0d78a.png b/sprites/spr_cata_right_leg/layers/ecf75db7-6223-4712-8157-c822a10e1617/f2501eb8-3d15-489b-9adf-21790df0d78a.png index fa6fe28eaa..2b64eae7b7 100644 Binary files a/sprites/spr_cata_right_leg/layers/ecf75db7-6223-4712-8157-c822a10e1617/f2501eb8-3d15-489b-9adf-21790df0d78a.png and b/sprites/spr_cata_right_leg/layers/ecf75db7-6223-4712-8157-c822a10e1617/f2501eb8-3d15-489b-9adf-21790df0d78a.png differ diff --git a/sprites/spr_cata_right_leg/spr_cata_right_leg.yy b/sprites/spr_cata_right_leg/spr_cata_right_leg.yy index 721ab51c65..1ca580df7d 100644 --- a/sprites/spr_cata_right_leg/spr_cata_right_leg.yy +++ b/sprites/spr_cata_right_leg/spr_cata_right_leg.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_right_trim_1/spr_cata_right_trim_1.yy b/sprites/spr_cata_right_trim_1/spr_cata_right_trim_1.yy index 90ca7ead10..af76f455cf 100644 --- a/sprites/spr_cata_right_trim_1/spr_cata_right_trim_1.yy +++ b/sprites/spr_cata_right_trim_1/spr_cata_right_trim_1.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_right_trim_2/spr_cata_right_trim_2.yy b/sprites/spr_cata_right_trim_2/spr_cata_right_trim_2.yy index bc936cb186..b91014cb6f 100644 --- a/sprites/spr_cata_right_trim_2/spr_cata_right_trim_2.yy +++ b/sprites/spr_cata_right_trim_2/spr_cata_right_trim_2.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_shoulder_hanging_leather_left/spr_cata_shoulder_hanging_leather_left.yy b/sprites/spr_cata_shoulder_hanging_leather_left/spr_cata_shoulder_hanging_leather_left.yy index c0d09db335..31dc8b678a 100644 --- a/sprites/spr_cata_shoulder_hanging_leather_left/spr_cata_shoulder_hanging_leather_left.yy +++ b/sprites/spr_cata_shoulder_hanging_leather_left/spr_cata_shoulder_hanging_leather_left.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_shoulder_hanging_leather_left_tips/spr_cata_shoulder_hanging_leather_left_tips.yy b/sprites/spr_cata_shoulder_hanging_leather_left_tips/spr_cata_shoulder_hanging_leather_left_tips.yy index 6210d1a317..e91bbf2fe7 100644 --- a/sprites/spr_cata_shoulder_hanging_leather_left_tips/spr_cata_shoulder_hanging_leather_left_tips.yy +++ b/sprites/spr_cata_shoulder_hanging_leather_left_tips/spr_cata_shoulder_hanging_leather_left_tips.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_shoulder_hanging_leather_right/spr_cata_shoulder_hanging_leather_right.yy b/sprites/spr_cata_shoulder_hanging_leather_right/spr_cata_shoulder_hanging_leather_right.yy index 81e195b0ee..a16d4ff808 100644 --- a/sprites/spr_cata_shoulder_hanging_leather_right/spr_cata_shoulder_hanging_leather_right.yy +++ b/sprites/spr_cata_shoulder_hanging_leather_right/spr_cata_shoulder_hanging_leather_right.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_shoulder_hanging_leather_right_tips/spr_cata_shoulder_hanging_leather_right_tips.yy b/sprites/spr_cata_shoulder_hanging_leather_right_tips/spr_cata_shoulder_hanging_leather_right_tips.yy index b105ebe708..ae1f30fe90 100644 --- a/sprites/spr_cata_shoulder_hanging_leather_right_tips/spr_cata_shoulder_hanging_leather_right_tips.yy +++ b/sprites/spr_cata_shoulder_hanging_leather_right_tips/spr_cata_shoulder_hanging_leather_right_tips.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_shoulder_hanging_mail_left/spr_cata_shoulder_hanging_mail_left.yy b/sprites/spr_cata_shoulder_hanging_mail_left/spr_cata_shoulder_hanging_mail_left.yy index fbb67c20a9..dda4ca964f 100644 --- a/sprites/spr_cata_shoulder_hanging_mail_left/spr_cata_shoulder_hanging_mail_left.yy +++ b/sprites/spr_cata_shoulder_hanging_mail_left/spr_cata_shoulder_hanging_mail_left.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_shoulder_hanging_mail_right/spr_cata_shoulder_hanging_mail_right.yy b/sprites/spr_cata_shoulder_hanging_mail_right/spr_cata_shoulder_hanging_mail_right.yy index db8de8d373..34df763b9e 100644 --- a/sprites/spr_cata_shoulder_hanging_mail_right/spr_cata_shoulder_hanging_mail_right.yy +++ b/sprites/spr_cata_shoulder_hanging_mail_right/spr_cata_shoulder_hanging_mail_right.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_tabbard_leather/spr_cata_tabbard_leather.yy b/sprites/spr_cata_tabbard_leather/spr_cata_tabbard_leather.yy index d34b7305cb..dc1c882114 100644 --- a/sprites/spr_cata_tabbard_leather/spr_cata_tabbard_leather.yy +++ b/sprites/spr_cata_tabbard_leather/spr_cata_tabbard_leather.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_tabbard_leather_hangings/spr_cata_tabbard_leather_hangings.yy b/sprites/spr_cata_tabbard_leather_hangings/spr_cata_tabbard_leather_hangings.yy index 57d1959a31..0d99c6f84e 100644 --- a/sprites/spr_cata_tabbard_leather_hangings/spr_cata_tabbard_leather_hangings.yy +++ b/sprites/spr_cata_tabbard_leather_hangings/spr_cata_tabbard_leather_hangings.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_cata_tabbard_mail/spr_cata_tabbard_mail.yy b/sprites/spr_cata_tabbard_mail/spr_cata_tabbard_mail.yy index 3628be0c38..3819453e21 100644 --- a/sprites/spr_cata_tabbard_mail/spr_cata_tabbard_mail.yy +++ b/sprites/spr_cata_tabbard_mail/spr_cata_tabbard_mail.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":6, + "xorigin":0, "yorigin":8, }, "swatchColours":null, diff --git a/sprites/spr_chaplain_helm/spr_chaplain_helm.yy b/sprites/spr_chaplain_helm/spr_chaplain_helm.yy index de26cbbaff..fe35859c50 100644 --- a/sprites/spr_chaplain_helm/spr_chaplain_helm.yy +++ b/sprites/spr_chaplain_helm/spr_chaplain_helm.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"570e9798-a363-4113-a62f-3329e557f4cf","path":"sprites/spr_chaplain_helm/spr_chaplain_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bddf969b-685c-491b-bfd5-97af3bc35d94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"570e9798-a363-4113-a62f-3329e557f4cf","path":"sprites/spr_chaplain_helm/spr_chaplain_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bddf969b-685c-491b-bfd5-97af3bc35d94","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_chaplain_term_helm/86934807-ea9a-4216-8308-41baa548c8fa.png b/sprites/spr_chaplain_term_helm/86934807-ea9a-4216-8308-41baa548c8fa.png index e46c21e9e2..f910321a3b 100644 Binary files a/sprites/spr_chaplain_term_helm/86934807-ea9a-4216-8308-41baa548c8fa.png and b/sprites/spr_chaplain_term_helm/86934807-ea9a-4216-8308-41baa548c8fa.png differ diff --git a/sprites/spr_chaplain_term_helm/layers/86934807-ea9a-4216-8308-41baa548c8fa/ae0c933d-af58-4bf7-b86c-2e064499e4ff.png b/sprites/spr_chaplain_term_helm/layers/86934807-ea9a-4216-8308-41baa548c8fa/ae0c933d-af58-4bf7-b86c-2e064499e4ff.png index 304fe427bd..f910321a3b 100644 Binary files a/sprites/spr_chaplain_term_helm/layers/86934807-ea9a-4216-8308-41baa548c8fa/ae0c933d-af58-4bf7-b86c-2e064499e4ff.png and b/sprites/spr_chaplain_term_helm/layers/86934807-ea9a-4216-8308-41baa548c8fa/ae0c933d-af58-4bf7-b86c-2e064499e4ff.png differ diff --git a/sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy b/sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy index ed9d7c0e47..ec9d402c9c 100644 --- a/sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy +++ b/sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy @@ -23,7 +23,7 @@ ], "name":"spr_chaplain_term_helm", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"helms", "path":"folders/Sprites/Marine Viewer/helms.yy", @@ -63,17 +63,21 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"86934807-ea9a-4216-8308-41baa548c8fa","path":"sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11bace7a-9f35-49e0-8162-88bc61d6e2f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"86934807-ea9a-4216-8308-41baa548c8fa","path":"sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"11bace7a-9f35-49e0-8162-88bc61d6e2f5","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, + "xorigin":-8, "yorigin":0, }, "swatchColours":null, diff --git a/sprites/spr_clothing_colors/spr_clothing_colors.yy b/sprites/spr_clothing_colors/spr_clothing_colors.yy index 9ff70c13ef..8fe794b712 100644 --- a/sprites/spr_clothing_colors/spr_clothing_colors.yy +++ b/sprites/spr_clothing_colors/spr_clothing_colors.yy @@ -68,17 +68,31 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"6c1ac744-e669-4c51-96ac-bbe8eea6bfae","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e07b4d3e-0669-4928-a562-47c40ba77db5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d158eb91-f130-4e16-af39-30aac05cb488","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bddf3682-9e00-425e-8774-4ea49b9c8ab3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"342e62ff-f04a-428e-a2d9-8233602655b8","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b0a6723-f6e6-4e94-959c-05577505a332","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8e914c6-8ce3-4abc-93ca-2420808bf57e","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"edf7c680-8f06-4e1f-afdc-983d063e1ac7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"28a52a45-1899-4218-b532-41887f1818c7","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d828a12b-e196-4f3b-bbfa-4920c47c97cc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"772e8755-978f-4592-8a42-f82683e16608","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b46c4c7-8187-4341-b1df-384a0c33c2b5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6c1ac744-e669-4c51-96ac-bbe8eea6bfae","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e07b4d3e-0669-4928-a562-47c40ba77db5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d158eb91-f130-4e16-af39-30aac05cb488","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bddf3682-9e00-425e-8774-4ea49b9c8ab3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"342e62ff-f04a-428e-a2d9-8233602655b8","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6b0a6723-f6e6-4e94-959c-05577505a332","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8e914c6-8ce3-4abc-93ca-2420808bf57e","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"edf7c680-8f06-4e1f-afdc-983d063e1ac7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"28a52a45-1899-4218-b532-41887f1818c7","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d828a12b-e196-4f3b-bbfa-4920c47c97cc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"772e8755-978f-4592-8a42-f82683e16608","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7b46c4c7-8187-4341-b1df-384a0c33c2b5","IsCreationKey":false,"Key":5.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_crux_belt_fancy/spr_crux_belt_fancy.yy b/sprites/spr_crux_belt_fancy/spr_crux_belt_fancy.yy index 402e7fe6a8..97b9ce2caf 100644 --- a/sprites/spr_crux_belt_fancy/spr_crux_belt_fancy.yy +++ b/sprites/spr_crux_belt_fancy/spr_crux_belt_fancy.yy @@ -23,7 +23,7 @@ ], "name":"spr_crux_belt_fancy", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"specialist", "path":"folders/Sprites/Marine Viewer/body_types/specialist.yy", @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, + "xorigin":-2, "yorigin":0, }, "swatchColours":null, diff --git a/sprites/spr_crux_on_chain/spr_crux_on_chain.yy b/sprites/spr_crux_on_chain/spr_crux_on_chain.yy index 04bd976d95..cee60c04dc 100644 --- a/sprites/spr_crux_on_chain/spr_crux_on_chain.yy +++ b/sprites/spr_crux_on_chain/spr_crux_on_chain.yy @@ -63,12 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","path":"sprites/spr_crux_on_chain/spr_crux_on_chain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eca151ad-2626-4748-b179-608856db3925","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","path":"sprites/spr_crux_on_chain/spr_crux_on_chain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"eca151ad-2626-4748-b179-608856db3925","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_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy b/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy index d5ddf25fb7..2b66c36298 100644 --- a/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy +++ b/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy @@ -85,7 +85,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":63, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_belt/7173924c-400c-4ee3-8b3d-0123aa659415.png b/sprites/spr_indomitus_belt/7173924c-400c-4ee3-8b3d-0123aa659415.png index 65c0b2578c..6a920a2bf0 100644 Binary files a/sprites/spr_indomitus_belt/7173924c-400c-4ee3-8b3d-0123aa659415.png and b/sprites/spr_indomitus_belt/7173924c-400c-4ee3-8b3d-0123aa659415.png differ diff --git a/sprites/spr_indomitus_belt/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_belt/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png index 65c0b2578c..6a920a2bf0 100644 Binary files a/sprites/spr_indomitus_belt/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png and b/sprites/spr_indomitus_belt/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_belt/spr_indomitus_belt.yy b/sprites/spr_indomitus_belt/spr_indomitus_belt.yy index aa9efbc748..9ddf24f160 100644 --- a/sprites/spr_indomitus_belt/spr_indomitus_belt.yy +++ b/sprites/spr_indomitus_belt/spr_indomitus_belt.yy @@ -85,7 +85,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy b/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy index 70eefdaa19..4f882d5afc 100644 --- a/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy +++ b/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy @@ -65,19 +65,27 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"f0e60637-c555-4a00-8c01-76f1d0b98b07","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"27d4c94a-6c66-4f0c-a0bc-26b973bcf167","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4e60b7e-673d-4732-a579-27be19e0db5f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"57d77f6f-9937-40c8-b693-bb5f79d81e9f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0e60637-c555-4a00-8c01-76f1d0b98b07","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"27d4c94a-6c66-4f0c-a0bc-26b973bcf167","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d4e60b7e-673d-4732-a579-27be19e0db5f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"57d77f6f-9937-40c8-b693-bb5f79d81e9f","IsCreationKey":false,"Key":2.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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_complex/7173924c-400c-4ee3-8b3d-0123aa659415.png b/sprites/spr_indomitus_complex/7173924c-400c-4ee3-8b3d-0123aa659415.png index 5eddacd831..93ab1bbf02 100644 Binary files a/sprites/spr_indomitus_complex/7173924c-400c-4ee3-8b3d-0123aa659415.png and b/sprites/spr_indomitus_complex/7173924c-400c-4ee3-8b3d-0123aa659415.png differ diff --git a/sprites/spr_indomitus_complex/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_complex/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png index 5eddacd831..93ab1bbf02 100644 Binary files a/sprites/spr_indomitus_complex/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png and b/sprites/spr_indomitus_complex/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_complex/spr_indomitus_complex.yy b/sprites/spr_indomitus_complex/spr_indomitus_complex.yy index 8cf0958e19..149d517bed 100644 --- a/sprites/spr_indomitus_complex/spr_indomitus_complex.yy +++ b/sprites/spr_indomitus_complex/spr_indomitus_complex.yy @@ -70,12 +70,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7173924c-400c-4ee3-8b3d-0123aa659415","path":"sprites/spr_indomitus_complex/spr_indomitus_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e1fa933-e2c0-4763-b072-75adc49be13b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7173924c-400c-4ee3-8b3d-0123aa659415","path":"sprites/spr_indomitus_complex/spr_indomitus_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6e1fa933-e2c0-4763-b072-75adc49be13b","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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_complex_psy_hood/spr_indomitus_complex_psy_hood.yy b/sprites/spr_indomitus_complex_psy_hood/spr_indomitus_complex_psy_hood.yy index 22990c0ca5..818d157d41 100644 --- a/sprites/spr_indomitus_complex_psy_hood/spr_indomitus_complex_psy_hood.yy +++ b/sprites/spr_indomitus_complex_psy_hood/spr_indomitus_complex_psy_hood.yy @@ -86,7 +86,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_complex_psy_hood_cables/spr_indomitus_complex_psy_hood_cables.yy b/sprites/spr_indomitus_complex_psy_hood_cables/spr_indomitus_complex_psy_hood_cables.yy index 4f8e6b5f6c..8a38d2c391 100644 --- a/sprites/spr_indomitus_complex_psy_hood_cables/spr_indomitus_complex_psy_hood_cables.yy +++ b/sprites/spr_indomitus_complex_psy_hood_cables/spr_indomitus_complex_psy_hood_cables.yy @@ -90,7 +90,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_complex_psy_hood_crown/spr_indomitus_complex_psy_hood_crown.yy b/sprites/spr_indomitus_complex_psy_hood_crown/spr_indomitus_complex_psy_hood_crown.yy index d69b8bb8bd..5354b0d398 100644 --- a/sprites/spr_indomitus_complex_psy_hood_crown/spr_indomitus_complex_psy_hood_crown.yy +++ b/sprites/spr_indomitus_complex_psy_hood_crown/spr_indomitus_complex_psy_hood_crown.yy @@ -86,7 +86,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_complex_shadows/7173924c-400c-4ee3-8b3d-0123aa659415.png b/sprites/spr_indomitus_complex_shadows/7173924c-400c-4ee3-8b3d-0123aa659415.png new file mode 100644 index 0000000000..708570f530 Binary files /dev/null and b/sprites/spr_indomitus_complex_shadows/7173924c-400c-4ee3-8b3d-0123aa659415.png differ diff --git a/sprites/spr_indomitus_complex_shadows/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_complex_shadows/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png new file mode 100644 index 0000000000..708570f530 Binary files /dev/null and b/sprites/spr_indomitus_complex_shadows/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_complex_shadows/spr_indomitus_complex_shadows.yy b/sprites/spr_indomitus_complex_shadows/spr_indomitus_complex_shadows.yy new file mode 100644 index 0000000000..ffb388424a --- /dev/null +++ b/sprites/spr_indomitus_complex_shadows/spr_indomitus_complex_shadows.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_indomitus_complex_shadows", + "bboxMode":0, + "bbox_bottom":185, + "bbox_left":10, + "bbox_right":172, + "bbox_top":32, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"03d917a8-bff1-45d7-818b-f057c5540e44","blendMode":0,"displayName":"default","isLocked":false,"name":"03d917a8-bff1-45d7-818b-f057c5540e44","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_indomitus_complex_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"indomitus_complex", + "path":"folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_indomitus_complex_shadows", + "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_indomitus_complex_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"7173924c-400c-4ee3-8b3d-0123aa659415","path":"sprites/spr_indomitus_complex_shadows/spr_indomitus_complex_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6e1fa933-e2c0-4763-b072-75adc49be13b","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":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_indomitus_head_variants/7173924c-400c-4ee3-8b3d-0123aa659415.png b/sprites/spr_indomitus_head_variants/7173924c-400c-4ee3-8b3d-0123aa659415.png index 810f193847..0b2690cea2 100644 Binary files a/sprites/spr_indomitus_head_variants/7173924c-400c-4ee3-8b3d-0123aa659415.png and b/sprites/spr_indomitus_head_variants/7173924c-400c-4ee3-8b3d-0123aa659415.png differ diff --git a/sprites/spr_indomitus_head_variants/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_head_variants/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png index 810f193847..0b2690cea2 100644 Binary files a/sprites/spr_indomitus_head_variants/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png and b/sprites/spr_indomitus_head_variants/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy b/sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy index 6acad6e83b..3d04b98586 100644 --- a/sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy +++ b/sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy @@ -70,12 +70,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7173924c-400c-4ee3-8b3d-0123aa659415","path":"sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c4562bd4-7167-4589-a834-2a10a6e5f760","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7173924c-400c-4ee3-8b3d-0123aa659415","path":"sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c4562bd4-7167-4589-a834-2a10a6e5f760","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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_head_variants_shadows/7173924c-400c-4ee3-8b3d-0123aa659415.png b/sprites/spr_indomitus_head_variants_shadows/7173924c-400c-4ee3-8b3d-0123aa659415.png new file mode 100644 index 0000000000..3cd87fcc04 Binary files /dev/null and b/sprites/spr_indomitus_head_variants_shadows/7173924c-400c-4ee3-8b3d-0123aa659415.png differ diff --git a/sprites/spr_indomitus_head_variants_shadows/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_head_variants_shadows/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png new file mode 100644 index 0000000000..3cd87fcc04 Binary files /dev/null and b/sprites/spr_indomitus_head_variants_shadows/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_head_variants_shadows/spr_indomitus_head_variants_shadows.yy b/sprites/spr_indomitus_head_variants_shadows/spr_indomitus_head_variants_shadows.yy new file mode 100644 index 0000000000..89e163671f --- /dev/null +++ b/sprites/spr_indomitus_head_variants_shadows/spr_indomitus_head_variants_shadows.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_indomitus_head_variants_shadows", + "bboxMode":0, + "bbox_bottom":88, + "bbox_left":65, + "bbox_right":115, + "bbox_top":43, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"03d917a8-bff1-45d7-818b-f057c5540e44","blendMode":0,"displayName":"default","isLocked":false,"name":"03d917a8-bff1-45d7-818b-f057c5540e44","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_indomitus_head_variants_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"indomitus_complex", + "path":"folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_indomitus_head_variants_shadows", + "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_indomitus_head_variants_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"7173924c-400c-4ee3-8b3d-0123aa659415","path":"sprites/spr_indomitus_head_variants_shadows/spr_indomitus_head_variants_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c4562bd4-7167-4589-a834-2a10a6e5f760","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":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy b/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy index 88ad31c5d4..da72db7173 100644 --- a/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy +++ b/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy b/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy index 5d3fe8a32c..2b15f6aef1 100644 --- a/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy +++ b/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy b/sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy index d2152c4349..4a3a8b37d8 100644 --- a/sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy +++ b/sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":39, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy b/sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy index fa39646b34..51e229b368 100644 --- a/sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy +++ b/sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy @@ -66,20 +66,30 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"31989d85-49ac-4983-b8fb-45efa3e06aa7","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3e165ea6-1ddf-40bb-a32d-fef77fd9555d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"936f44b7-0688-4ef8-ab24-68a532190ed6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2091eff0-d98c-4046-bc81-0b1e7f0364d1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e450a15-0e35-401c-afff-0b2bc7c79c4f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3e165ea6-1ddf-40bb-a32d-fef77fd9555d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"936f44b7-0688-4ef8-ab24-68a532190ed6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2091eff0-d98c-4046-bc81-0b1e7f0364d1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9e450a15-0e35-401c-afff-0b2bc7c79c4f","IsCreationKey":false,"Key":3.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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy b/sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy index 9e6cc9cf5f..fd22de1c0c 100644 --- a/sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy +++ b/sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy @@ -70,12 +70,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d086015e-a6f4-4603-8d87-f9dc34671215","path":"sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf738b7d-36e3-4cdb-bf14-0edd5444950b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d086015e-a6f4-4603-8d87-f9dc34671215","path":"sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bf738b7d-36e3-4cdb-bf14-0edd5444950b","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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy b/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy index fb009449c6..df34234b5a 100644 --- a/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy +++ b/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":39, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy b/sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy index 21ac8b11f6..fd7491bed1 100644 --- a/sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy +++ b/sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy @@ -72,14 +72,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e60513c5-fcc3-459c-916e-8b19128ed541","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c9fab82-bd4c-4aaa-8995-50ee32141c65","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb2de076-5af9-459a-b130-624bab24de74","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67c33f4c-ee5a-4a87-99df-324d5f6e3d29","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3cfeac81-ef68-4b7a-9463-ea132dcc12df","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e60513c5-fcc3-459c-916e-8b19128ed541","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8c9fab82-bd4c-4aaa-8995-50ee32141c65","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb2de076-5af9-459a-b130-624bab24de74","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"67c33f4c-ee5a-4a87-99df-324d5f6e3d29","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3cfeac81-ef68-4b7a-9463-ea132dcc12df","IsCreationKey":false,"Key":2.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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_leg_variants/1717fb82-7e0f-4cdd-b0f7-e881ec8ad680.png b/sprites/spr_indomitus_leg_variants/1717fb82-7e0f-4cdd-b0f7-e881ec8ad680.png new file mode 100644 index 0000000000..c0ab9506e4 Binary files /dev/null and b/sprites/spr_indomitus_leg_variants/1717fb82-7e0f-4cdd-b0f7-e881ec8ad680.png differ diff --git a/sprites/spr_indomitus_leg_variants/220fdf6f-48b5-4de0-9576-27b046131605.png b/sprites/spr_indomitus_leg_variants/220fdf6f-48b5-4de0-9576-27b046131605.png index cc96d92c64..d091efe10f 100644 Binary files a/sprites/spr_indomitus_leg_variants/220fdf6f-48b5-4de0-9576-27b046131605.png and b/sprites/spr_indomitus_leg_variants/220fdf6f-48b5-4de0-9576-27b046131605.png differ diff --git a/sprites/spr_indomitus_leg_variants/b1984530-db57-4951-bec4-a09cab003f1a.png b/sprites/spr_indomitus_leg_variants/b1984530-db57-4951-bec4-a09cab003f1a.png index 1262d6ae4b..646a3c52e2 100644 Binary files a/sprites/spr_indomitus_leg_variants/b1984530-db57-4951-bec4-a09cab003f1a.png and b/sprites/spr_indomitus_leg_variants/b1984530-db57-4951-bec4-a09cab003f1a.png differ diff --git a/sprites/spr_indomitus_leg_variants/layers/1717fb82-7e0f-4cdd-b0f7-e881ec8ad680/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_leg_variants/layers/1717fb82-7e0f-4cdd-b0f7-e881ec8ad680/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png new file mode 100644 index 0000000000..c0ab9506e4 Binary files /dev/null and b/sprites/spr_indomitus_leg_variants/layers/1717fb82-7e0f-4cdd-b0f7-e881ec8ad680/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_leg_variants/layers/220fdf6f-48b5-4de0-9576-27b046131605/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_leg_variants/layers/220fdf6f-48b5-4de0-9576-27b046131605/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png index cc96d92c64..d091efe10f 100644 Binary files a/sprites/spr_indomitus_leg_variants/layers/220fdf6f-48b5-4de0-9576-27b046131605/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png and b/sprites/spr_indomitus_leg_variants/layers/220fdf6f-48b5-4de0-9576-27b046131605/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_leg_variants/layers/b1984530-db57-4951-bec4-a09cab003f1a/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_leg_variants/layers/b1984530-db57-4951-bec4-a09cab003f1a/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png index 1262d6ae4b..646a3c52e2 100644 Binary files a/sprites/spr_indomitus_leg_variants/layers/b1984530-db57-4951-bec4-a09cab003f1a/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png and b/sprites/spr_indomitus_leg_variants/layers/b1984530-db57-4951-bec4-a09cab003f1a/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy b/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy index 744c4e4c69..d8cd678c00 100644 --- a/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy +++ b/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy @@ -13,6 +13,7 @@ "For3D":false, "frames":[ {"$GMSpriteFrame":"v1","%Name":"b1984530-db57-4951-bec4-a09cab003f1a","name":"b1984530-db57-4951-bec4-a09cab003f1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1717fb82-7e0f-4cdd-b0f7-e881ec8ad680","name":"1717fb82-7e0f-4cdd-b0f7-e881ec8ad680","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"220fdf6f-48b5-4de0-9576-27b046131605","name":"220fdf6f-48b5-4de0-9576-27b046131605","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, @@ -50,7 +51,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":2.0, + "length":3.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -71,13 +72,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1984530-db57-4951-bec4-a09cab003f1a","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"764ed5f4-cd44-421c-9173-78dc4b5c4698","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"220fdf6f-48b5-4de0-9576-27b046131605","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d185e240-e0cf-4973-93cf-cd6660ec621e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1984530-db57-4951-bec4-a09cab003f1a","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"764ed5f4-cd44-421c-9173-78dc4b5c4698","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1717fb82-7e0f-4cdd-b0f7-e881ec8ad680","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d38863ce-3890-4bb1-8284-7718da807cd8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"220fdf6f-48b5-4de0-9576-27b046131605","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d185e240-e0cf-4973-93cf-cd6660ec621e","IsCreationKey":false,"Key":2.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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_leg_variants_shadows/220fdf6f-48b5-4de0-9576-27b046131605.png b/sprites/spr_indomitus_leg_variants_shadows/220fdf6f-48b5-4de0-9576-27b046131605.png new file mode 100644 index 0000000000..1a38721bd0 Binary files /dev/null and b/sprites/spr_indomitus_leg_variants_shadows/220fdf6f-48b5-4de0-9576-27b046131605.png differ diff --git a/sprites/spr_indomitus_leg_variants_shadows/b1984530-db57-4951-bec4-a09cab003f1a.png b/sprites/spr_indomitus_leg_variants_shadows/b1984530-db57-4951-bec4-a09cab003f1a.png new file mode 100644 index 0000000000..78358cf660 Binary files /dev/null and b/sprites/spr_indomitus_leg_variants_shadows/b1984530-db57-4951-bec4-a09cab003f1a.png differ diff --git a/sprites/spr_indomitus_leg_variants_shadows/f11ec996-00a0-4383-95d7-687ed1f9f302.png b/sprites/spr_indomitus_leg_variants_shadows/f11ec996-00a0-4383-95d7-687ed1f9f302.png new file mode 100644 index 0000000000..b079c0a0bf Binary files /dev/null and b/sprites/spr_indomitus_leg_variants_shadows/f11ec996-00a0-4383-95d7-687ed1f9f302.png differ diff --git a/sprites/spr_indomitus_leg_variants_shadows/layers/220fdf6f-48b5-4de0-9576-27b046131605/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_leg_variants_shadows/layers/220fdf6f-48b5-4de0-9576-27b046131605/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png new file mode 100644 index 0000000000..1a38721bd0 Binary files /dev/null and b/sprites/spr_indomitus_leg_variants_shadows/layers/220fdf6f-48b5-4de0-9576-27b046131605/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_leg_variants_shadows/layers/b1984530-db57-4951-bec4-a09cab003f1a/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_leg_variants_shadows/layers/b1984530-db57-4951-bec4-a09cab003f1a/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png new file mode 100644 index 0000000000..78358cf660 Binary files /dev/null and b/sprites/spr_indomitus_leg_variants_shadows/layers/b1984530-db57-4951-bec4-a09cab003f1a/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_leg_variants_shadows/layers/f11ec996-00a0-4383-95d7-687ed1f9f302/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_leg_variants_shadows/layers/f11ec996-00a0-4383-95d7-687ed1f9f302/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png new file mode 100644 index 0000000000..b079c0a0bf Binary files /dev/null and b/sprites/spr_indomitus_leg_variants_shadows/layers/f11ec996-00a0-4383-95d7-687ed1f9f302/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_leg_variants_shadows/spr_indomitus_leg_variants_shadows.yy b/sprites/spr_indomitus_leg_variants_shadows/spr_indomitus_leg_variants_shadows.yy new file mode 100644 index 0000000000..7f2b81c27f --- /dev/null +++ b/sprites/spr_indomitus_leg_variants_shadows/spr_indomitus_leg_variants_shadows.yy @@ -0,0 +1,100 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_indomitus_leg_variants_shadows", + "bboxMode":0, + "bbox_bottom":259, + "bbox_left":11, + "bbox_right":169, + "bbox_top":165, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b1984530-db57-4951-bec4-a09cab003f1a","name":"b1984530-db57-4951-bec4-a09cab003f1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f11ec996-00a0-4383-95d7-687ed1f9f302","name":"f11ec996-00a0-4383-95d7-687ed1f9f302","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"220fdf6f-48b5-4de0-9576-27b046131605","name":"220fdf6f-48b5-4de0-9576-27b046131605","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"5ed376c2-9d33-44c5-9f13-c15f43e640b4","blendMode":0,"displayName":"default","isLocked":false,"name":"5ed376c2-9d33-44c5-9f13-c15f43e640b4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_indomitus_leg_variants_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"indomitus_complex", + "path":"folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_indomitus_leg_variants_shadows", + "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":3.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_indomitus_leg_variants_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"b1984530-db57-4951-bec4-a09cab003f1a","path":"sprites/spr_indomitus_leg_variants_shadows/spr_indomitus_leg_variants_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"764ed5f4-cd44-421c-9173-78dc4b5c4698","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f11ec996-00a0-4383-95d7-687ed1f9f302","path":"sprites/spr_indomitus_leg_variants_shadows/spr_indomitus_leg_variants_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"72be29e1-0c21-472d-922f-72b530477e36","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"220fdf6f-48b5-4de0-9576-27b046131605","path":"sprites/spr_indomitus_leg_variants_shadows/spr_indomitus_leg_variants_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d185e240-e0cf-4973-93cf-cd6660ec621e","IsCreationKey":false,"Key":2.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":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy b/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy index ca3cf7ac40..9f6c05ca67 100644 --- a/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy +++ b/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy @@ -63,17 +63,21 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","path":"sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2172cfc5-5476-46d2-ba16-c7a79aada399","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","path":"sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2172cfc5-5476-46d2-ba16-c7a79aada399","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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy b/sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy index 9474f87e14..b0e05edacb 100644 --- a/sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy +++ b/sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy @@ -63,17 +63,21 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","path":"sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e2d22107-2e4d-4737-813b-630e2f5e6019","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","path":"sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e2d22107-2e4d-4737-813b-630e2f5e6019","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":7, + "xorigin":0, "yorigin":39, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_right_arm_shadows/d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc.png b/sprites/spr_indomitus_right_arm_shadows/d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc.png new file mode 100644 index 0000000000..c59f7e5918 Binary files /dev/null and b/sprites/spr_indomitus_right_arm_shadows/d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc.png differ diff --git a/sprites/spr_indomitus_right_arm_shadows/layers/d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc/55de725b-7bbe-44d0-9ec6-a9c031920d39.png b/sprites/spr_indomitus_right_arm_shadows/layers/d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc/55de725b-7bbe-44d0-9ec6-a9c031920d39.png new file mode 100644 index 0000000000..c59f7e5918 Binary files /dev/null and b/sprites/spr_indomitus_right_arm_shadows/layers/d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc/55de725b-7bbe-44d0-9ec6-a9c031920d39.png differ diff --git a/sprites/spr_indomitus_right_arm_shadows/spr_indomitus_right_arm_shadows.yy b/sprites/spr_indomitus_right_arm_shadows/spr_indomitus_right_arm_shadows.yy new file mode 100644 index 0000000000..cfda05770c --- /dev/null +++ b/sprites/spr_indomitus_right_arm_shadows/spr_indomitus_right_arm_shadows.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_indomitus_right_arm_shadows", + "bboxMode":0, + "bbox_bottom":170, + "bbox_left":5, + "bbox_right":48, + "bbox_top":89, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"55de725b-7bbe-44d0-9ec6-a9c031920d39","blendMode":0,"displayName":"default","isLocked":false,"name":"55de725b-7bbe-44d0-9ec6-a9c031920d39","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_indomitus_right_arm_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"indomitus_complex", + "path":"folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_indomitus_right_arm_shadows", + "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_indomitus_right_arm_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","path":"sprites/spr_indomitus_right_arm_shadows/spr_indomitus_right_arm_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2172cfc5-5476-46d2-ba16-c7a79aada399","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":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy b/sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy index d609229bea..1704652603 100644 --- a/sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy +++ b/sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy @@ -66,20 +66,30 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"31989d85-49ac-4983-b8fb-45efa3e06aa7","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d35ba92d-862a-4a6b-9d8e-48ca228e92e6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"351befce-72d1-4a78-83dd-ce6e61ecbc59","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"963149ce-2d78-4541-a317-b6b7fd2005b9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5d8f9c8-7c3a-4820-a284-cb7a62688cb4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d35ba92d-862a-4a6b-9d8e-48ca228e92e6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"351befce-72d1-4a78-83dd-ce6e61ecbc59","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"963149ce-2d78-4541-a317-b6b7fd2005b9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d5d8f9c8-7c3a-4820-a284-cb7a62688cb4","IsCreationKey":false,"Key":3.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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy b/sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy index 7712947e5a..37389f88b1 100644 --- a/sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy +++ b/sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy @@ -70,12 +70,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"597aa984-87e8-4425-8954-56127319e962","path":"sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64416029-b6e6-4746-b1c7-2acf5e2ea462","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"597aa984-87e8-4425-8954-56127319e962","path":"sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"64416029-b6e6-4746-b1c7-2acf5e2ea462","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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy b/sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy index 644950b276..e098829635 100644 --- a/sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy +++ b/sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy @@ -70,12 +70,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","path":"sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b971e5d-63dc-464f-a2a5-601dd3c60196","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","path":"sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7b971e5d-63dc-464f-a2a5-601dd3c60196","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":7, + "xorigin":0, "yorigin":39, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_right_shin/aa2b5092-d69b-4dac-8052-e89d83b7a246.png b/sprites/spr_indomitus_right_shin/aa2b5092-d69b-4dac-8052-e89d83b7a246.png index 54c8dedc09..41963ca75e 100644 Binary files a/sprites/spr_indomitus_right_shin/aa2b5092-d69b-4dac-8052-e89d83b7a246.png and b/sprites/spr_indomitus_right_shin/aa2b5092-d69b-4dac-8052-e89d83b7a246.png differ diff --git a/sprites/spr_indomitus_right_shin/b1bed381-dffb-49f9-b787-37a97bc22f95.png b/sprites/spr_indomitus_right_shin/b1bed381-dffb-49f9-b787-37a97bc22f95.png index de05508025..92f7551507 100644 Binary files a/sprites/spr_indomitus_right_shin/b1bed381-dffb-49f9-b787-37a97bc22f95.png and b/sprites/spr_indomitus_right_shin/b1bed381-dffb-49f9-b787-37a97bc22f95.png differ diff --git a/sprites/spr_indomitus_right_shin/layers/aa2b5092-d69b-4dac-8052-e89d83b7a246/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_right_shin/layers/aa2b5092-d69b-4dac-8052-e89d83b7a246/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png index d6fbbc0359..41963ca75e 100644 Binary files a/sprites/spr_indomitus_right_shin/layers/aa2b5092-d69b-4dac-8052-e89d83b7a246/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png and b/sprites/spr_indomitus_right_shin/layers/aa2b5092-d69b-4dac-8052-e89d83b7a246/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_right_shin/layers/b1bed381-dffb-49f9-b787-37a97bc22f95/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_right_shin/layers/b1bed381-dffb-49f9-b787-37a97bc22f95/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png index de05508025..92f7551507 100644 Binary files a/sprites/spr_indomitus_right_shin/layers/b1bed381-dffb-49f9-b787-37a97bc22f95/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png and b/sprites/spr_indomitus_right_shin/layers/b1bed381-dffb-49f9-b787-37a97bc22f95/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy b/sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy index e7a1a3493a..c6264934e7 100644 --- a/sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy +++ b/sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy @@ -3,9 +3,9 @@ "%Name":"spr_indomitus_right_shin", "bboxMode":0, "bbox_bottom":248, - "bbox_left":0, + "bbox_left":16, "bbox_right":68, - "bbox_top":0, + "bbox_top":194, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, @@ -72,14 +72,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1bed381-dffb-49f9-b787-37a97bc22f95","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"48a05983-ea7b-44c3-a992-de9cc1664717","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c47c8ef5-80d7-495f-aed4-2018547c6479","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21dded79-bee1-4a00-b8ed-516dcd97f1e7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1961e603-5686-438f-aff5-54e527aeb5a6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1bed381-dffb-49f9-b787-37a97bc22f95","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"48a05983-ea7b-44c3-a992-de9cc1664717","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c47c8ef5-80d7-495f-aed4-2018547c6479","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"21dded79-bee1-4a00-b8ed-516dcd97f1e7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1961e603-5686-438f-aff5-54e527aeb5a6","IsCreationKey":false,"Key":2.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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_right_shin_shadows/aa2b5092-d69b-4dac-8052-e89d83b7a246.png b/sprites/spr_indomitus_right_shin_shadows/aa2b5092-d69b-4dac-8052-e89d83b7a246.png new file mode 100644 index 0000000000..0700940889 Binary files /dev/null and b/sprites/spr_indomitus_right_shin_shadows/aa2b5092-d69b-4dac-8052-e89d83b7a246.png differ diff --git a/sprites/spr_indomitus_right_shin_shadows/b1bed381-dffb-49f9-b787-37a97bc22f95.png b/sprites/spr_indomitus_right_shin_shadows/b1bed381-dffb-49f9-b787-37a97bc22f95.png new file mode 100644 index 0000000000..3caf437896 Binary files /dev/null and b/sprites/spr_indomitus_right_shin_shadows/b1bed381-dffb-49f9-b787-37a97bc22f95.png differ diff --git a/sprites/spr_indomitus_right_shin_shadows/c47c8ef5-80d7-495f-aed4-2018547c6479.png b/sprites/spr_indomitus_right_shin_shadows/c47c8ef5-80d7-495f-aed4-2018547c6479.png new file mode 100644 index 0000000000..f919dcaff3 Binary files /dev/null and b/sprites/spr_indomitus_right_shin_shadows/c47c8ef5-80d7-495f-aed4-2018547c6479.png differ diff --git a/sprites/spr_indomitus_right_shin_shadows/layers/aa2b5092-d69b-4dac-8052-e89d83b7a246/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_right_shin_shadows/layers/aa2b5092-d69b-4dac-8052-e89d83b7a246/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png new file mode 100644 index 0000000000..0700940889 Binary files /dev/null and b/sprites/spr_indomitus_right_shin_shadows/layers/aa2b5092-d69b-4dac-8052-e89d83b7a246/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_right_shin_shadows/layers/b1bed381-dffb-49f9-b787-37a97bc22f95/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_right_shin_shadows/layers/b1bed381-dffb-49f9-b787-37a97bc22f95/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png new file mode 100644 index 0000000000..3caf437896 Binary files /dev/null and b/sprites/spr_indomitus_right_shin_shadows/layers/b1bed381-dffb-49f9-b787-37a97bc22f95/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_right_shin_shadows/layers/c47c8ef5-80d7-495f-aed4-2018547c6479/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_right_shin_shadows/layers/c47c8ef5-80d7-495f-aed4-2018547c6479/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png new file mode 100644 index 0000000000..b47925a530 Binary files /dev/null and b/sprites/spr_indomitus_right_shin_shadows/layers/c47c8ef5-80d7-495f-aed4-2018547c6479/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_right_shin_shadows/spr_indomitus_right_shin_shadows.yy b/sprites/spr_indomitus_right_shin_shadows/spr_indomitus_right_shin_shadows.yy new file mode 100644 index 0000000000..40b7f8605f --- /dev/null +++ b/sprites/spr_indomitus_right_shin_shadows/spr_indomitus_right_shin_shadows.yy @@ -0,0 +1,100 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_indomitus_right_shin_shadows", + "bboxMode":0, + "bbox_bottom":248, + "bbox_left":16, + "bbox_right":68, + "bbox_top":194, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b1bed381-dffb-49f9-b787-37a97bc22f95","name":"b1bed381-dffb-49f9-b787-37a97bc22f95","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c47c8ef5-80d7-495f-aed4-2018547c6479","name":"c47c8ef5-80d7-495f-aed4-2018547c6479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"5ed376c2-9d33-44c5-9f13-c15f43e640b4","blendMode":0,"displayName":"default","isLocked":false,"name":"5ed376c2-9d33-44c5-9f13-c15f43e640b4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_indomitus_right_shin_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"indomitus_complex", + "path":"folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_indomitus_right_shin_shadows", + "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":3.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_indomitus_right_shin_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"b1bed381-dffb-49f9-b787-37a97bc22f95","path":"sprites/spr_indomitus_right_shin_shadows/spr_indomitus_right_shin_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"48a05983-ea7b-44c3-a992-de9cc1664717","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c47c8ef5-80d7-495f-aed4-2018547c6479","path":"sprites/spr_indomitus_right_shin_shadows/spr_indomitus_right_shin_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"21dded79-bee1-4a00-b8ed-516dcd97f1e7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","path":"sprites/spr_indomitus_right_shin_shadows/spr_indomitus_right_shin_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1961e603-5686-438f-aff5-54e527aeb5a6","IsCreationKey":false,"Key":2.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":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_marine_base/spr_marine_base.yy b/sprites/spr_marine_base/spr_marine_base.yy index 0a2f24af04..db920b7221 100644 --- a/sprites/spr_marine_base/spr_marine_base.yy +++ b/sprites/spr_marine_base/spr_marine_base.yy @@ -69,18 +69,34 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e6adee3-2036-475d-9a6f-d99dc9e6e50c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a05aea4-57b6-4ab4-803b-a93394062444","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40fc45f9-b0d9-411a-a4b0-64633b87398d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e4353a96-ea37-4bc1-8e30-3748a110a3f5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd950c16-6d9d-4e20-a10d-276227a20344","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3357145b-4829-48c8-9e70-363ecb8cccb2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fba90e85-801a-4835-aed5-4bb97356cb61","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88f5ae33-5381-4147-899c-feaae6733f32","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0de4c5d-f50a-473f-9115-15ff989e446c","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e686c46d-d3e4-42ad-b4d8-bc5c53313237","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"112d615d-f6ee-4aef-b624-bf4d20ae8400","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be715bb4-0b5e-490b-a3a1-2a4dceef2e44","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7e6adee3-2036-475d-9a6f-d99dc9e6e50c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a05aea4-57b6-4ab4-803b-a93394062444","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"40fc45f9-b0d9-411a-a4b0-64633b87398d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e4353a96-ea37-4bc1-8e30-3748a110a3f5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd950c16-6d9d-4e20-a10d-276227a20344","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3357145b-4829-48c8-9e70-363ecb8cccb2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fba90e85-801a-4835-aed5-4bb97356cb61","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"88f5ae33-5381-4147-899c-feaae6733f32","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0de4c5d-f50a-473f-9115-15ff989e446c","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e686c46d-d3e4-42ad-b4d8-bc5c53313237","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"112d615d-f6ee-4aef-b624-bf4d20ae8400","path":"sprites/spr_marine_base/spr_marine_base.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"be715bb4-0b5e-490b-a3a1-2a4dceef2e44","IsCreationKey":false,"Key":6.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_marine_head/spr_marine_head.yy b/sprites/spr_marine_head/spr_marine_head.yy index b648dcd902..834ce41403 100644 --- a/sprites/spr_marine_head/spr_marine_head.yy +++ b/sprites/spr_marine_head/spr_marine_head.yy @@ -68,17 +68,31 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9baab639-23b7-4d59-88d7-494e2931e56c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a05aea4-57b6-4ab4-803b-a93394062444","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"997fb703-58ef-440f-9c7a-44f62882543f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc9a2629-0444-42e0-9f6d-cf2661d1b364","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd950c16-6d9d-4e20-a10d-276227a20344","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7bfc88a-66d4-467a-9544-8ef7d91d3cae","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fba90e85-801a-4835-aed5-4bb97356cb61","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"709b1f01-0ae6-42a7-8c57-5676c50b7cb0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0de4c5d-f50a-473f-9115-15ff989e446c","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f63c763-7e25-4e4b-8dc2-c61e0dffca39","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9baab639-23b7-4d59-88d7-494e2931e56c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a05aea4-57b6-4ab4-803b-a93394062444","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"997fb703-58ef-440f-9c7a-44f62882543f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"dc9a2629-0444-42e0-9f6d-cf2661d1b364","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd950c16-6d9d-4e20-a10d-276227a20344","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a7bfc88a-66d4-467a-9544-8ef7d91d3cae","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fba90e85-801a-4835-aed5-4bb97356cb61","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"709b1f01-0ae6-42a7-8c57-5676c50b7cb0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0de4c5d-f50a-473f-9115-15ff989e446c","path":"sprites/spr_marine_head/spr_marine_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8f63c763-7e25-4e4b-8dc2-c61e0dffca39","IsCreationKey":false,"Key":5.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_leg_variants/spr_mk4_leg_variants.yy b/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy index 3e3acecc96..5767518ca5 100644 --- a/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy +++ b/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy @@ -66,15 +66,25 @@ "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":"f5551e24-09d8-40c0-888e-0e5818c0c403","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0d74eee-2fdc-4c64-89a0-eca5b14b32d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee26bab2-02cc-4e4d-a75a-00c04cf56d3e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79b13155-0f85-4e11-9fef-324bf6e87d15","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e5b82f0-b1e4-4462-9747-2831172b74a5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01846774-a3dd-4995-9497-fbee372af500","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5551e24-09d8-40c0-888e-0e5818c0c403","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f0d74eee-2fdc-4c64-89a0-eca5b14b32d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ee26bab2-02cc-4e4d-a75a-00c04cf56d3e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79b13155-0f85-4e11-9fef-324bf6e87d15","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6e5b82f0-b1e4-4462-9747-2831172b74a5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","path":"sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"01846774-a3dd-4995-9497-fbee372af500","IsCreationKey":false,"Key":3.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_crux_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex_crux_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png index 0cf1f92a29..1bfc1ddaa7 100644 Binary files a/sprites/spr_mk7_complex_crux_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png and b/sprites/spr_mk7_complex_crux_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png differ diff --git a/sprites/spr_mk7_complex_crux_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_complex_crux_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png index 0cf1f92a29..1bfc1ddaa7 100644 Binary files a/sprites/spr_mk7_complex_crux_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png and b/sprites/spr_mk7_complex_crux_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy b/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy index fab1ea0d20..f063783b46 100644 --- a/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy +++ b/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy @@ -26,7 +26,7 @@ ], "name":"spr_mk7_left_trim", "nineSlice":null, - "origin":9, + "origin":0, "parent":{ "name":"mk_7_complex", "path":"folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", @@ -89,7 +89,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":-2, + "xorigin":0, "yorigin":0, }, "swatchColours":null, diff --git a/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy b/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy index fde1910d87..118e79ff83 100644 --- a/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy +++ b/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy @@ -3,9 +3,9 @@ "%Name":"spr_mk7_right_trim", "bboxMode":0, "bbox_bottom":81, - "bbox_left":0, + "bbox_left":10, "bbox_right":58, - "bbox_top":0, + "bbox_top":27, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, @@ -26,7 +26,7 @@ ], "name":"spr_mk7_right_trim", "nineSlice":null, - "origin":9, + "origin":0, "parent":{ "name":"mk_7_complex", "path":"folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", @@ -73,15 +73,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"22f140e8-36e9-438e-ac20-4d6a50de8292","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c59f380a-e222-4020-bf08-125985f587ac","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e8a26e7-bfc2-42e4-bcfe-afeebb652382","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a096d33-1914-457f-a964-ec5ba2833a6e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"09035cbe-5b3d-4474-a920-751ccede1b22","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0675daf6-3a75-4886-b1c7-7d722f306c69","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"22f140e8-36e9-438e-ac20-4d6a50de8292","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c59f380a-e222-4020-bf08-125985f587ac","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2e8a26e7-bfc2-42e4-bcfe-afeebb652382","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5a096d33-1914-457f-a964-ec5ba2833a6e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"09035cbe-5b3d-4474-a920-751ccede1b22","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0675daf6-3a75-4886-b1c7-7d722f306c69","IsCreationKey":false,"Key":3.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, + "xorigin":0, "yorigin":0, }, "swatchColours":null, diff --git a/sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy b/sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy index c2daf35793..7fedf5cac4 100644 --- a/sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy +++ b/sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy @@ -69,18 +69,34 @@ "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":"d359bd56-6962-4c59-a10d-f16ae433baa8","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3d2212a-239a-4ea3-b5f3-154921fccd5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"092aa646-8af7-4ede-a104-ccb04fae0cbf","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e077023e-8787-4782-9730-7a619200302f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5915a327-71ae-45ce-8bf1-4f238f188d9d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca44f968-4109-4468-901b-d07add46e880","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"007cbf5c-34b9-47f6-b9ec-9ba25915eea2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af74c721-e4c2-4842-b738-a2c688adc317","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c9ae7ee-19de-49e6-a417-1d9a3874db53","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d02faaf-2101-406d-a94f-527d1c7834db","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cfbe42f-6839-4f34-b9fa-cba90066c043","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5769f893-c909-4b88-9856-62d72a0b6130","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ecc1285-25c4-4843-abd9-6f539e6e54c3","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d359bd56-6962-4c59-a10d-f16ae433baa8","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d3d2212a-239a-4ea3-b5f3-154921fccd5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"092aa646-8af7-4ede-a104-ccb04fae0cbf","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e077023e-8787-4782-9730-7a619200302f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5915a327-71ae-45ce-8bf1-4f238f188d9d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca44f968-4109-4468-901b-d07add46e880","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"007cbf5c-34b9-47f6-b9ec-9ba25915eea2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af74c721-e4c2-4842-b738-a2c688adc317","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0c9ae7ee-19de-49e6-a417-1d9a3874db53","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d02faaf-2101-406d-a94f-527d1c7834db","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8cfbe42f-6839-4f34-b9fa-cba90066c043","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5769f893-c909-4b88-9856-62d72a0b6130","path":"sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7ecc1285-25c4-4843-abd9-6f539e6e54c3","IsCreationKey":false,"Key":6.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_mk8_gorget/spr_mk8_gorget.yy b/sprites/spr_mk8_gorget/spr_mk8_gorget.yy index bb7e1b1d87..cc4d7c7954 100644 --- a/sprites/spr_mk8_gorget/spr_mk8_gorget.yy +++ b/sprites/spr_mk8_gorget/spr_mk8_gorget.yy @@ -69,18 +69,34 @@ "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":"851a2104-903f-436b-b68b-06b80d754bf4","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"80b2289b-cc75-4ca5-96ca-3097105f3fd2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"383a62b7-cef5-4267-b973-3ac3aad57cca","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3419f9e2-c3bc-467e-bdf0-b5dab567d3fb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"603329e3-8632-4533-b8b4-82b83c307cac","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"533ed542-183a-4df2-9110-ce46ac29753c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aaaa8953-8c99-4e89-99d3-90bb371e571c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4999c3e-8f41-4b09-ac88-634015b49682","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"98495c8f-472a-43e1-9468-6da68d0a2e8f","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"158ee31a-9f08-4c7d-9e87-fae8d166c376","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f44dc52-686d-478a-8f07-84ac5d102ce6","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"851a2104-903f-436b-b68b-06b80d754bf4","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"80b2289b-cc75-4ca5-96ca-3097105f3fd2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"383a62b7-cef5-4267-b973-3ac3aad57cca","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3419f9e2-c3bc-467e-bdf0-b5dab567d3fb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"603329e3-8632-4533-b8b4-82b83c307cac","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"533ed542-183a-4df2-9110-ce46ac29753c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"aaaa8953-8c99-4e89-99d3-90bb371e571c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4999c3e-8f41-4b09-ac88-634015b49682","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"98495c8f-472a-43e1-9468-6da68d0a2e8f","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"158ee31a-9f08-4c7d-9e87-fae8d166c376","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0f44dc52-686d-478a-8f07-84ac5d102ce6","IsCreationKey":false,"Key":6.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_noarmour_colors/spr_noarmour_colors.yy b/sprites/spr_noarmour_colors/spr_noarmour_colors.yy index 1077824ab1..4f002b7a4a 100644 --- a/sprites/spr_noarmour_colors/spr_noarmour_colors.yy +++ b/sprites/spr_noarmour_colors/spr_noarmour_colors.yy @@ -64,19 +64,22 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"7fda383a-1b96-43ab-9b00-348ba94f24e3","path":"sprites/spr_noarmour_colors/spr_noarmour_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee2b0a1a-4b5e-48a3-8ce7-58a199d69840","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfcef27b-ef94-422d-b312-1aeaffa3836e","path":"sprites/spr_noarmour_colors/spr_noarmour_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38cc4662-e007-4c05-a7a0-3f86779d9c91","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fda383a-1b96-43ab-9b00-348ba94f24e3","path":"sprites/spr_noarmour_colors/spr_noarmour_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ee2b0a1a-4b5e-48a3-8ce7-58a199d69840","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfcef27b-ef94-422d-b312-1aeaffa3836e","path":"sprites/spr_noarmour_colors/spr_noarmour_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"38cc4662-e007-4c05-a7a0-3f86779d9c91","IsCreationKey":false,"Key":1.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":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":0, "yorigin":0, diff --git a/sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy b/sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy index e157dec361..4e74b45bce 100644 --- a/sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy +++ b/sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy @@ -73,22 +73,46 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"3f2bfc4a-6242-4b4f-b23a-1b9f2f6b6238","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c41f3900-dc12-4b49-b98b-0d7a170baf03","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec7335a2-5940-4d44-a57a-6ef2b18a7aa6","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"85c89a55-0327-4971-80ce-3366386f4218","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d19f71d0-9c25-4938-8ff1-6ce05cbbaba0","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5acd614e-59ae-470d-801a-c8adbb073f8e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c4ca248-93ee-410c-b68a-e9ecec54b32d","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c086917-1259-4e08-bf38-0ea689d5711c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0bcfa324-70be-491f-9c81-e421ae10e401","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e364c448-758c-4a68-928f-88638a34ea3f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d0346f6-0c14-4ba9-810c-e8ee0515c859","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8419621f-a2f0-42cf-b98d-b404fffaa3f5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f3656b9-6717-4477-b5d1-05235b9bd903","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"613095cf-4896-472c-93d2-8e788859056d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"543bf910-3b46-44a3-b42d-585dec34b2e9","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67109820-6a6a-4c70-bf3e-d19a71229201","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c8308dbd-f9c5-4d70-8f5b-3f8a96183706","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed8a8b8c-e81b-4607-8f51-36a892833bc2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87e52bcf-0cde-4bd2-960a-18d56a5e5abf","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f3cc6f8-a073-4de5-ab24-7c85adbed67c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40d1b2e1-aad0-465c-9688-32ada947f8ea","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee316a3e-0794-43c9-9602-1d5b9a1337cc","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f2bfc4a-6242-4b4f-b23a-1b9f2f6b6238","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c41f3900-dc12-4b49-b98b-0d7a170baf03","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec7335a2-5940-4d44-a57a-6ef2b18a7aa6","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"85c89a55-0327-4971-80ce-3366386f4218","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d19f71d0-9c25-4938-8ff1-6ce05cbbaba0","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5acd614e-59ae-470d-801a-c8adbb073f8e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c4ca248-93ee-410c-b68a-e9ecec54b32d","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4c086917-1259-4e08-bf38-0ea689d5711c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0bcfa324-70be-491f-9c81-e421ae10e401","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e364c448-758c-4a68-928f-88638a34ea3f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d0346f6-0c14-4ba9-810c-e8ee0515c859","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8419621f-a2f0-42cf-b98d-b404fffaa3f5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f3656b9-6717-4477-b5d1-05235b9bd903","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"613095cf-4896-472c-93d2-8e788859056d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"543bf910-3b46-44a3-b42d-585dec34b2e9","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"67109820-6a6a-4c70-bf3e-d19a71229201","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c8308dbd-f9c5-4d70-8f5b-3f8a96183706","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ed8a8b8c-e81b-4607-8f51-36a892833bc2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87e52bcf-0cde-4bd2-960a-18d56a5e5abf","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7f3cc6f8-a073-4de5-ab24-7c85adbed67c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40d1b2e1-aad0-465c-9688-32ada947f8ea","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ee316a3e-0794-43c9-9602-1d5b9a1337cc","IsCreationKey":false,"Key":10.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_tartaros_chest/946bdde4-8095-44ad-83a5-1d5c8fe841cc.png b/sprites/spr_tartaros_chest/946bdde4-8095-44ad-83a5-1d5c8fe841cc.png index b78b8bb970..da13e1f8a6 100644 Binary files a/sprites/spr_tartaros_chest/946bdde4-8095-44ad-83a5-1d5c8fe841cc.png and b/sprites/spr_tartaros_chest/946bdde4-8095-44ad-83a5-1d5c8fe841cc.png differ diff --git a/sprites/spr_tartaros_chest/layers/946bdde4-8095-44ad-83a5-1d5c8fe841cc/ad6a6b27-874e-4748-9915-64a9a7bdaeed.png b/sprites/spr_tartaros_chest/layers/946bdde4-8095-44ad-83a5-1d5c8fe841cc/ad6a6b27-874e-4748-9915-64a9a7bdaeed.png index b78b8bb970..da13e1f8a6 100644 Binary files a/sprites/spr_tartaros_chest/layers/946bdde4-8095-44ad-83a5-1d5c8fe841cc/ad6a6b27-874e-4748-9915-64a9a7bdaeed.png and b/sprites/spr_tartaros_chest/layers/946bdde4-8095-44ad-83a5-1d5c8fe841cc/ad6a6b27-874e-4748-9915-64a9a7bdaeed.png differ diff --git a/sprites/spr_tartaros_chest/spr_tartaros_chest.yy b/sprites/spr_tartaros_chest/spr_tartaros_chest.yy index f478936088..86874b1b12 100644 --- a/sprites/spr_tartaros_chest/spr_tartaros_chest.yy +++ b/sprites/spr_tartaros_chest/spr_tartaros_chest.yy @@ -67,21 +67,33 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"614d5587-3f3b-4727-832e-9a4a26b4e261","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"524957d3-4452-4fba-bc1d-d08e55003395","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9fc80f31-12c7-4a2b-8b28-b89867d9f9d7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"946bdde4-8095-44ad-83a5-1d5c8fe841cc","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"226750b9-f6d5-4984-a641-3e83f01f49d5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7e2c49c-625f-41b2-b038-8e96b289e8ed","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4342a328-5f7a-4eb1-9741-993a5add8e13","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1fba91e-ad9a-43f5-9563-4660af64f354","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3b1e77f-e553-4d71-b0d1-17a80320e88e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"614d5587-3f3b-4727-832e-9a4a26b4e261","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"524957d3-4452-4fba-bc1d-d08e55003395","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9fc80f31-12c7-4a2b-8b28-b89867d9f9d7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"946bdde4-8095-44ad-83a5-1d5c8fe841cc","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"226750b9-f6d5-4984-a641-3e83f01f49d5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7e2c49c-625f-41b2-b038-8e96b289e8ed","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4342a328-5f7a-4eb1-9741-993a5add8e13","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1fba91e-ad9a-43f5-9563-4660af64f354","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d3b1e77f-e553-4d71-b0d1-17a80320e88e","IsCreationKey":false,"Key":4.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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":[ diff --git a/sprites/spr_tartaros_chest_shadows/3a335b0a-c79a-4dce-ae6d-823d512b0c53.png b/sprites/spr_tartaros_chest_shadows/3a335b0a-c79a-4dce-ae6d-823d512b0c53.png new file mode 100644 index 0000000000..cb36b265f1 Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/3a335b0a-c79a-4dce-ae6d-823d512b0c53.png differ diff --git a/sprites/spr_tartaros_chest_shadows/77c22ee4-8c36-4010-bb36-a483f3eb9263.png b/sprites/spr_tartaros_chest_shadows/77c22ee4-8c36-4010-bb36-a483f3eb9263.png new file mode 100644 index 0000000000..3311282c2c Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/77c22ee4-8c36-4010-bb36-a483f3eb9263.png differ diff --git a/sprites/spr_tartaros_chest_shadows/7b2e5457-70b3-4576-9c6e-f1ff7f76462b.png b/sprites/spr_tartaros_chest_shadows/7b2e5457-70b3-4576-9c6e-f1ff7f76462b.png new file mode 100644 index 0000000000..68e5f2a12e Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/7b2e5457-70b3-4576-9c6e-f1ff7f76462b.png differ diff --git a/sprites/spr_tartaros_chest_shadows/95ec6a03-17e7-4fb4-aeb5-335f9ef3b530.png b/sprites/spr_tartaros_chest_shadows/95ec6a03-17e7-4fb4-aeb5-335f9ef3b530.png new file mode 100644 index 0000000000..43523fc467 Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/95ec6a03-17e7-4fb4-aeb5-335f9ef3b530.png differ diff --git a/sprites/spr_tartaros_chest_shadows/f936957a-511c-4522-9cd5-dbe2411d039e.png b/sprites/spr_tartaros_chest_shadows/f936957a-511c-4522-9cd5-dbe2411d039e.png new file mode 100644 index 0000000000..cb36b265f1 Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/f936957a-511c-4522-9cd5-dbe2411d039e.png differ diff --git a/sprites/spr_tartaros_chest_shadows/layers/3a335b0a-c79a-4dce-ae6d-823d512b0c53/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png b/sprites/spr_tartaros_chest_shadows/layers/3a335b0a-c79a-4dce-ae6d-823d512b0c53/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png new file mode 100644 index 0000000000..cb36b265f1 Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/layers/3a335b0a-c79a-4dce-ae6d-823d512b0c53/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png differ diff --git a/sprites/spr_tartaros_chest_shadows/layers/77c22ee4-8c36-4010-bb36-a483f3eb9263/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png b/sprites/spr_tartaros_chest_shadows/layers/77c22ee4-8c36-4010-bb36-a483f3eb9263/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png new file mode 100644 index 0000000000..3311282c2c Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/layers/77c22ee4-8c36-4010-bb36-a483f3eb9263/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png differ diff --git a/sprites/spr_tartaros_chest_shadows/layers/7b2e5457-70b3-4576-9c6e-f1ff7f76462b/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png b/sprites/spr_tartaros_chest_shadows/layers/7b2e5457-70b3-4576-9c6e-f1ff7f76462b/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png new file mode 100644 index 0000000000..68e5f2a12e Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/layers/7b2e5457-70b3-4576-9c6e-f1ff7f76462b/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png differ diff --git a/sprites/spr_tartaros_chest_shadows/layers/95ec6a03-17e7-4fb4-aeb5-335f9ef3b530/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png b/sprites/spr_tartaros_chest_shadows/layers/95ec6a03-17e7-4fb4-aeb5-335f9ef3b530/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png new file mode 100644 index 0000000000..43523fc467 Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/layers/95ec6a03-17e7-4fb4-aeb5-335f9ef3b530/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png differ diff --git a/sprites/spr_tartaros_chest_shadows/layers/f936957a-511c-4522-9cd5-dbe2411d039e/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png b/sprites/spr_tartaros_chest_shadows/layers/f936957a-511c-4522-9cd5-dbe2411d039e/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png new file mode 100644 index 0000000000..cb36b265f1 Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/layers/f936957a-511c-4522-9cd5-dbe2411d039e/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png differ diff --git a/sprites/spr_tartaros_chest_shadows/spr_tartaros_chest_shadows.yy b/sprites/spr_tartaros_chest_shadows/spr_tartaros_chest_shadows.yy new file mode 100644 index 0000000000..027ef28b7c --- /dev/null +++ b/sprites/spr_tartaros_chest_shadows/spr_tartaros_chest_shadows.yy @@ -0,0 +1,121 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_chest_shadows", + "bboxMode":0, + "bbox_bottom":124, + "bbox_left":54, + "bbox_right":127, + "bbox_top":69, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"3a335b0a-c79a-4dce-ae6d-823d512b0c53","name":"3a335b0a-c79a-4dce-ae6d-823d512b0c53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"77c22ee4-8c36-4010-bb36-a483f3eb9263","name":"77c22ee4-8c36-4010-bb36-a483f3eb9263","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b2e5457-70b3-4576-9c6e-f1ff7f76462b","name":"7b2e5457-70b3-4576-9c6e-f1ff7f76462b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f936957a-511c-4522-9cd5-dbe2411d039e","name":"f936957a-511c-4522-9cd5-dbe2411d039e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95ec6a03-17e7-4fb4-aeb5-335f9ef3b530","name":"95ec6a03-17e7-4fb4-aeb5-335f9ef3b530","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"62408588-d2cd-4ba8-9fed-c84d5cd2f54f","blendMode":0,"displayName":"default","isLocked":false,"name":"62408588-d2cd-4ba8-9fed-c84d5cd2f54f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_chest_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"tartaros_complex", + "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_tartaros_chest_shadows", + "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":5.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tartaros_chest_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"3a335b0a-c79a-4dce-ae6d-823d512b0c53","path":"sprites/spr_tartaros_chest_shadows/spr_tartaros_chest_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"02e45933-aaeb-42c1-b1da-920ef7e0bbbc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"77c22ee4-8c36-4010-bb36-a483f3eb9263","path":"sprites/spr_tartaros_chest_shadows/spr_tartaros_chest_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"290746af-ce59-4c7f-baf3-e99525aaa188","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b2e5457-70b3-4576-9c6e-f1ff7f76462b","path":"sprites/spr_tartaros_chest_shadows/spr_tartaros_chest_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"85c0eabe-1c88-43b0-9ff0-af415d7874b4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f936957a-511c-4522-9cd5-dbe2411d039e","path":"sprites/spr_tartaros_chest_shadows/spr_tartaros_chest_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"40ecebf6-7139-4863-8d6c-8b3e05058fb4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95ec6a03-17e7-4fb4-aeb5-335f9ef3b530","path":"sprites/spr_tartaros_chest_shadows/spr_tartaros_chest_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bf0e42f2-56c4-4d90-89ee-a000a4c201e9","IsCreationKey":false,"Key":4.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":38, + }, + "swatchColours":[ + 4278190335,4278255615,4278255360,4294967040,4294901760,4294902015,4294967295,4293717228,4293059298,4292335575, + 4291677645,4290230199,4287993237,4280556782,4278252287,4283540992,4293963264,4287770926,4287365357,4287203721, + 4286414205,4285558896,4284703587,4283782485,4281742902,4278190080,4286158839,4286688762,4287219453,4288280831, + 4288405444,4288468131,4288465538,4291349882,4294430829,4292454269,4291466115,4290675079,4290743485,4290943732, + 4288518390,4283395315,4283862775,4284329979,4285068799,4285781164,4285973884,4286101564,4290034460,4294164224, + 4291529796,4289289312,4289290373,4289291432,4289359601,4286410226,4280556782,4280444402,4280128760,4278252287, + 4282369933,4283086137,4283540992,4288522496,4293963264,4290540032,4289423360,4289090560,4287770926,4287704422, + 4287571858,4287365357,4284159214,4279176094,4279058848,4278870691,4278231211,4281367321,4278190080,4278190080, + 4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080, + 4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080, + 4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080, + 4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080, + ], + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_tartaros_colors/spr_tartaros_colors.yy b/sprites/spr_tartaros_colors/spr_tartaros_colors.yy index 566896eba2..c97b0bd035 100644 --- a/sprites/spr_tartaros_colors/spr_tartaros_colors.yy +++ b/sprites/spr_tartaros_colors/spr_tartaros_colors.yy @@ -72,27 +72,46 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.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":"ecafdcef-f511-430c-91a8-30ee6580a6a0","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34b77065-59f1-48fd-bbff-25801600d196","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5426d439-bb49-4082-84f2-452c2d01792d","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53780185-be8b-46ac-912d-7c692f3f010b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b761b33-b38f-4ca4-b119-c55bc0a2e9e7","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1866eb17-5b89-4bd2-828c-3538411f9ad2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcad843f-7d6a-4d7b-bce1-4c936c6d6716","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"216105e0-d4c9-4ecc-bdf8-3f2847611871","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfda7d39-c01c-40f5-9586-9eab35c2b6e7","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7918b408-3607-4ae0-bdbf-9d8fb59221a2","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf80a677-6b33-4cd5-947e-b85ecaa4fe02","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3eca94f8-cb12-4785-b37b-97cf40cac3b9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d19339a9-682c-4ecc-9fc6-75a6c034dea6","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7971b6c4-b7bd-4dbc-a538-fcef7c030333","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"532e1c80-fbc6-423b-b4b7-054831518ddb","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"788ca99e-a175-4c13-a67c-3588c28d7096","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f63c7a7a-9ec3-49cd-9f33-a951dfc4c97a","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a5c67d6-8638-4da5-9708-42645eca8cc1","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d222518e-ee62-4391-ba3b-eaf17a4e8460","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6d5d89e-ff91-442b-95ca-096f4946bc98","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecafdcef-f511-430c-91a8-30ee6580a6a0","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"34b77065-59f1-48fd-bbff-25801600d196","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5426d439-bb49-4082-84f2-452c2d01792d","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"53780185-be8b-46ac-912d-7c692f3f010b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b761b33-b38f-4ca4-b119-c55bc0a2e9e7","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1866eb17-5b89-4bd2-828c-3538411f9ad2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcad843f-7d6a-4d7b-bce1-4c936c6d6716","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"216105e0-d4c9-4ecc-bdf8-3f2847611871","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfda7d39-c01c-40f5-9586-9eab35c2b6e7","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7918b408-3607-4ae0-bdbf-9d8fb59221a2","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf80a677-6b33-4cd5-947e-b85ecaa4fe02","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3eca94f8-cb12-4785-b37b-97cf40cac3b9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d19339a9-682c-4ecc-9fc6-75a6c034dea6","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7971b6c4-b7bd-4dbc-a538-fcef7c030333","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"532e1c80-fbc6-423b-b4b7-054831518ddb","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"788ca99e-a175-4c13-a67c-3588c28d7096","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f63c7a7a-9ec3-49cd-9f33-a951dfc4c97a","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1a5c67d6-8638-4da5-9708-42645eca8cc1","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d222518e-ee62-4391-ba3b-eaf17a4e8460","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b6d5d89e-ff91-442b-95ca-096f4946bc98","IsCreationKey":false,"Key":9.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":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":0, "yorigin":0, diff --git a/sprites/spr_tartaros_complex/8d99f92f-4aac-47e4-a142-c6ea6be47856.png b/sprites/spr_tartaros_complex/8d99f92f-4aac-47e4-a142-c6ea6be47856.png index aa88fdf8c7..a2676a41b7 100644 Binary files a/sprites/spr_tartaros_complex/8d99f92f-4aac-47e4-a142-c6ea6be47856.png and b/sprites/spr_tartaros_complex/8d99f92f-4aac-47e4-a142-c6ea6be47856.png differ diff --git a/sprites/spr_tartaros_complex/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/229b5182-d233-4896-9f67-630367846af5.png b/sprites/spr_tartaros_complex/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/229b5182-d233-4896-9f67-630367846af5.png index aa88fdf8c7..a2676a41b7 100644 Binary files a/sprites/spr_tartaros_complex/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/229b5182-d233-4896-9f67-630367846af5.png and b/sprites/spr_tartaros_complex/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/229b5182-d233-4896-9f67-630367846af5.png differ diff --git a/sprites/spr_tartaros_complex/spr_tartaros_complex.yy b/sprites/spr_tartaros_complex/spr_tartaros_complex.yy index 0bc2a54da2..4909f8060f 100644 --- a/sprites/spr_tartaros_complex/spr_tartaros_complex.yy +++ b/sprites/spr_tartaros_complex/spr_tartaros_complex.yy @@ -70,12 +70,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_complex/spr_tartaros_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"200ce5df-a2aa-43be-8768-a74ae1023185","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_complex/spr_tartaros_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"200ce5df-a2aa-43be-8768-a74ae1023185","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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy b/sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy index 5bb2c636b3..edf9a79c37 100644 --- a/sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy +++ b/sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy @@ -64,18 +64,24 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"1bbe2e76-e507-418e-8883-0db45afc0631","path":"sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ad15b71-232e-4b9e-af97-b93727f87d22","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2594043-39aa-46d0-b252-cce3b13f1f83","path":"sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3780d8c2-ec67-452f-99ba-bd70998da1b4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1bbe2e76-e507-418e-8883-0db45afc0631","path":"sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5ad15b71-232e-4b9e-af97-b93727f87d22","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2594043-39aa-46d0-b252-cce3b13f1f83","path":"sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3780d8c2-ec67-452f-99ba-bd70998da1b4","IsCreationKey":false,"Key":1.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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy b/sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy index 863b3ae604..00fe2f233f 100644 --- a/sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy +++ b/sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy @@ -89,7 +89,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy b/sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy index a0421b534d..2a5c953d44 100644 --- a/sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy +++ b/sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy @@ -89,7 +89,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy b/sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy index 571c80b373..e204286024 100644 --- a/sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy +++ b/sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy @@ -89,7 +89,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy b/sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy index 818c6370c3..878c8bf5b4 100644 --- a/sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy +++ b/sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy @@ -89,7 +89,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_head_shadows/spr_tartaros_head_shadows.yy b/sprites/spr_tartaros_head_shadows/spr_tartaros_head_shadows.yy index ca96c5261a..20837e5cba 100644 --- a/sprites/spr_tartaros_head_shadows/spr_tartaros_head_shadows.yy +++ b/sprites/spr_tartaros_head_shadows/spr_tartaros_head_shadows.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy b/sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy index b8ffc78105..d4af0a8401 100644 --- a/sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy +++ b/sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy b/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy index e4bb833db9..6d9118aded 100644 --- a/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy +++ b/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy @@ -63,17 +63,21 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","path":"sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b145eebe-c835-41cf-bd87-3c3bea207624","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","path":"sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b145eebe-c835-41cf-bd87-3c3bea207624","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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy b/sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy index 4f8a51c7ac..b9a4d7348c 100644 --- a/sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy +++ b/sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy @@ -67,21 +67,33 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"1b0c3505-55a7-478a-a52c-1c5aa3702630","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"653c4b23-ec3f-4d49-ae10-5c7e4e5be38b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03d9ca8d-b461-47ef-abbc-e53ae850d225","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a1883bea-ff73-4dff-b321-2056492825f1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9a9cf23-f9c7-4d60-9393-c38dc6b2d0ed","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11a92fc7-841a-4ccb-b540-46106925949c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9bb0037-8489-4bbd-90a4-43bddaaff972","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b7991bc-e7c7-4705-bc58-08069621d87a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3b39034-cdc1-41f6-872e-22e6e9d5f55a","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8adf71b2-d631-415c-b16f-a35ad4e63d75","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b0c3505-55a7-478a-a52c-1c5aa3702630","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"653c4b23-ec3f-4d49-ae10-5c7e4e5be38b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03d9ca8d-b461-47ef-abbc-e53ae850d225","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a1883bea-ff73-4dff-b321-2056492825f1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9a9cf23-f9c7-4d60-9393-c38dc6b2d0ed","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"11a92fc7-841a-4ccb-b540-46106925949c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9bb0037-8489-4bbd-90a4-43bddaaff972","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2b7991bc-e7c7-4705-bc58-08069621d87a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3b39034-cdc1-41f6-872e-22e6e9d5f55a","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8adf71b2-d631-415c-b16f-a35ad4e63d75","IsCreationKey":false,"Key":4.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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy b/sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy index 14b3cdffc5..e78734c7a2 100644 --- a/sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy +++ b/sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy @@ -75,17 +75,29 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87c67940-615a-4e4c-96cf-ace9b6595aec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5defea7d-cb28-4fdc-8073-ce633c560aae","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6512c5fb-4688-450e-910f-44cf16e2beaa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba4e548a-d091-462f-b13c-22072470a25f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"558d01e7-d386-4e7d-b377-e2a5a8bcf3ad","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e02a6d09-d97e-4137-a1cb-faf4a8a7120d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00046679-5075-4ad2-8995-2c6c2244ab41","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88356a81-e2c1-4885-a67f-5d82110bef59","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"87c67940-615a-4e4c-96cf-ace9b6595aec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5defea7d-cb28-4fdc-8073-ce633c560aae","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6512c5fb-4688-450e-910f-44cf16e2beaa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ba4e548a-d091-462f-b13c-22072470a25f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"558d01e7-d386-4e7d-b377-e2a5a8bcf3ad","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e02a6d09-d97e-4137-a1cb-faf4a8a7120d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00046679-5075-4ad2-8995-2c6c2244ab41","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"88356a81-e2c1-4885-a67f-5d82110bef59","IsCreationKey":false,"Key":5.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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_leg_rivets/spr_tartaros_leg_rivets.yy b/sprites/spr_tartaros_leg_rivets/spr_tartaros_leg_rivets.yy index 28e58cd5a5..70a4d99101 100644 --- a/sprites/spr_tartaros_leg_rivets/spr_tartaros_leg_rivets.yy +++ b/sprites/spr_tartaros_leg_rivets/spr_tartaros_leg_rivets.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy b/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy index e1b5fc4e3c..1737521381 100644 --- a/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy +++ b/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_right_arm_shadows/spr_tartaros_right_arm_shadows.yy b/sprites/spr_tartaros_right_arm_shadows/spr_tartaros_right_arm_shadows.yy index e28f329926..58d9a4d37d 100644 --- a/sprites/spr_tartaros_right_arm_shadows/spr_tartaros_right_arm_shadows.yy +++ b/sprites/spr_tartaros_right_arm_shadows/spr_tartaros_right_arm_shadows.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_right_leg/392ae0b5-e73f-4011-a77c-8cf14df79212.png b/sprites/spr_tartaros_right_leg/392ae0b5-e73f-4011-a77c-8cf14df79212.png index 5e10bf8bbf..e271e9bb55 100644 Binary files a/sprites/spr_tartaros_right_leg/392ae0b5-e73f-4011-a77c-8cf14df79212.png and b/sprites/spr_tartaros_right_leg/392ae0b5-e73f-4011-a77c-8cf14df79212.png differ diff --git a/sprites/spr_tartaros_right_leg/8d99f92f-4aac-47e4-a142-c6ea6be47856.png b/sprites/spr_tartaros_right_leg/8d99f92f-4aac-47e4-a142-c6ea6be47856.png index 5cbdd4d1e8..ccf0e26c7c 100644 Binary files a/sprites/spr_tartaros_right_leg/8d99f92f-4aac-47e4-a142-c6ea6be47856.png and b/sprites/spr_tartaros_right_leg/8d99f92f-4aac-47e4-a142-c6ea6be47856.png differ diff --git a/sprites/spr_tartaros_right_leg/b89831c0-4b54-41e5-ad80-4d838fe31550.png b/sprites/spr_tartaros_right_leg/b89831c0-4b54-41e5-ad80-4d838fe31550.png index 81dacec169..ebddde7cf2 100644 Binary files a/sprites/spr_tartaros_right_leg/b89831c0-4b54-41e5-ad80-4d838fe31550.png and b/sprites/spr_tartaros_right_leg/b89831c0-4b54-41e5-ad80-4d838fe31550.png differ diff --git a/sprites/spr_tartaros_right_leg/f31258fb-8e42-40fa-9abe-d50ce4077249.png b/sprites/spr_tartaros_right_leg/f31258fb-8e42-40fa-9abe-d50ce4077249.png index a6afc5f943..0fdc24d80c 100644 Binary files a/sprites/spr_tartaros_right_leg/f31258fb-8e42-40fa-9abe-d50ce4077249.png and b/sprites/spr_tartaros_right_leg/f31258fb-8e42-40fa-9abe-d50ce4077249.png differ diff --git a/sprites/spr_tartaros_right_leg/layers/392ae0b5-e73f-4011-a77c-8cf14df79212/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_right_leg/layers/392ae0b5-e73f-4011-a77c-8cf14df79212/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png index 5e10bf8bbf..e271e9bb55 100644 Binary files a/sprites/spr_tartaros_right_leg/layers/392ae0b5-e73f-4011-a77c-8cf14df79212/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png and b/sprites/spr_tartaros_right_leg/layers/392ae0b5-e73f-4011-a77c-8cf14df79212/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png differ diff --git a/sprites/spr_tartaros_right_leg/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_right_leg/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png index 5cbdd4d1e8..ccf0e26c7c 100644 Binary files a/sprites/spr_tartaros_right_leg/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png and b/sprites/spr_tartaros_right_leg/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png differ diff --git a/sprites/spr_tartaros_right_leg/layers/b89831c0-4b54-41e5-ad80-4d838fe31550/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_right_leg/layers/b89831c0-4b54-41e5-ad80-4d838fe31550/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png index 81dacec169..ebddde7cf2 100644 Binary files a/sprites/spr_tartaros_right_leg/layers/b89831c0-4b54-41e5-ad80-4d838fe31550/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png and b/sprites/spr_tartaros_right_leg/layers/b89831c0-4b54-41e5-ad80-4d838fe31550/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png differ diff --git a/sprites/spr_tartaros_right_leg/layers/f31258fb-8e42-40fa-9abe-d50ce4077249/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_right_leg/layers/f31258fb-8e42-40fa-9abe-d50ce4077249/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png index a6afc5f943..0fdc24d80c 100644 Binary files a/sprites/spr_tartaros_right_leg/layers/f31258fb-8e42-40fa-9abe-d50ce4077249/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png and b/sprites/spr_tartaros_right_leg/layers/f31258fb-8e42-40fa-9abe-d50ce4077249/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png differ diff --git a/sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy b/sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy index 060d50ec34..91b4e31127 100644 --- a/sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy +++ b/sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy @@ -89,7 +89,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy b/sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy index 19b470aa43..288c3d187a 100644 --- a/sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy +++ b/sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy @@ -89,7 +89,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_right_trim/7d968db5-be75-47d2-9c6a-3cb4f41b09fc.png b/sprites/spr_tartaros_right_trim/7d968db5-be75-47d2-9c6a-3cb4f41b09fc.png index fac8b6ebb2..2e358ad42c 100644 Binary files a/sprites/spr_tartaros_right_trim/7d968db5-be75-47d2-9c6a-3cb4f41b09fc.png and b/sprites/spr_tartaros_right_trim/7d968db5-be75-47d2-9c6a-3cb4f41b09fc.png differ diff --git a/sprites/spr_tartaros_right_trim/96a0b084-110c-46b1-b8e4-cde02fa49c20.png b/sprites/spr_tartaros_right_trim/96a0b084-110c-46b1-b8e4-cde02fa49c20.png index 1efd363d76..2e358ad42c 100644 Binary files a/sprites/spr_tartaros_right_trim/96a0b084-110c-46b1-b8e4-cde02fa49c20.png and b/sprites/spr_tartaros_right_trim/96a0b084-110c-46b1-b8e4-cde02fa49c20.png differ diff --git a/sprites/spr_tartaros_right_trim/9ac0f902-e80a-4de4-b09c-2700ec2dfaf6.png b/sprites/spr_tartaros_right_trim/9ac0f902-e80a-4de4-b09c-2700ec2dfaf6.png index 5f7e25ebb1..6e9c4a9bd3 100644 Binary files a/sprites/spr_tartaros_right_trim/9ac0f902-e80a-4de4-b09c-2700ec2dfaf6.png and b/sprites/spr_tartaros_right_trim/9ac0f902-e80a-4de4-b09c-2700ec2dfaf6.png differ diff --git a/sprites/spr_tartaros_right_trim/layers/7d968db5-be75-47d2-9c6a-3cb4f41b09fc/229b5182-d233-4896-9f67-630367846af5.png b/sprites/spr_tartaros_right_trim/layers/7d968db5-be75-47d2-9c6a-3cb4f41b09fc/229b5182-d233-4896-9f67-630367846af5.png index fac8b6ebb2..2e358ad42c 100644 Binary files a/sprites/spr_tartaros_right_trim/layers/7d968db5-be75-47d2-9c6a-3cb4f41b09fc/229b5182-d233-4896-9f67-630367846af5.png and b/sprites/spr_tartaros_right_trim/layers/7d968db5-be75-47d2-9c6a-3cb4f41b09fc/229b5182-d233-4896-9f67-630367846af5.png differ diff --git a/sprites/spr_tartaros_right_trim/layers/96a0b084-110c-46b1-b8e4-cde02fa49c20/229b5182-d233-4896-9f67-630367846af5.png b/sprites/spr_tartaros_right_trim/layers/96a0b084-110c-46b1-b8e4-cde02fa49c20/229b5182-d233-4896-9f67-630367846af5.png index 1efd363d76..2e358ad42c 100644 Binary files a/sprites/spr_tartaros_right_trim/layers/96a0b084-110c-46b1-b8e4-cde02fa49c20/229b5182-d233-4896-9f67-630367846af5.png and b/sprites/spr_tartaros_right_trim/layers/96a0b084-110c-46b1-b8e4-cde02fa49c20/229b5182-d233-4896-9f67-630367846af5.png differ diff --git a/sprites/spr_tartaros_right_trim/layers/9ac0f902-e80a-4de4-b09c-2700ec2dfaf6/229b5182-d233-4896-9f67-630367846af5.png b/sprites/spr_tartaros_right_trim/layers/9ac0f902-e80a-4de4-b09c-2700ec2dfaf6/229b5182-d233-4896-9f67-630367846af5.png index 5f7e25ebb1..6e9c4a9bd3 100644 Binary files a/sprites/spr_tartaros_right_trim/layers/9ac0f902-e80a-4de4-b09c-2700ec2dfaf6/229b5182-d233-4896-9f67-630367846af5.png and b/sprites/spr_tartaros_right_trim/layers/9ac0f902-e80a-4de4-b09c-2700ec2dfaf6/229b5182-d233-4896-9f67-630367846af5.png differ diff --git a/sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy b/sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy index db1811217f..349dbfb8de 100644 --- a/sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy +++ b/sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy @@ -3,9 +3,9 @@ "%Name":"spr_tartaros_right_trim", "bboxMode":0, "bbox_bottom":179, - "bbox_left":0, + "bbox_left":10, "bbox_right":139, - "bbox_top":0, + "bbox_top":44, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, @@ -68,22 +68,36 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"76deae19-d9fc-4802-8db5-0ee21731ef01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5defea7d-cb28-4fdc-8073-ce633c560aae","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c445da5a-43c3-45e6-b38d-aca5f22fd53b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"10585c1e-d18e-4e00-9ea7-0ba35ccfd87c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc5d7569-0411-4194-845d-954de995277f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0423a612-f90c-42e1-8c56-e4dbe243a6fb","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00046679-5075-4ad2-8995-2c6c2244ab41","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4a280a15-1721-43d4-a285-202541575345","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"76deae19-d9fc-4802-8db5-0ee21731ef01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5defea7d-cb28-4fdc-8073-ce633c560aae","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c445da5a-43c3-45e6-b38d-aca5f22fd53b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"10585c1e-d18e-4e00-9ea7-0ba35ccfd87c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bc5d7569-0411-4194-845d-954de995277f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0423a612-f90c-42e1-8c56-e4dbe243a6fb","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00046679-5075-4ad2-8995-2c6c2244ab41","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4a280a15-1721-43d4-a285-202541575345","IsCreationKey":false,"Key":5.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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_right_trim_shadows/100b29ea-fe77-4be7-9047-263452df1459.png b/sprites/spr_tartaros_right_trim_shadows/100b29ea-fe77-4be7-9047-263452df1459.png new file mode 100644 index 0000000000..81c0b4e7b8 Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/100b29ea-fe77-4be7-9047-263452df1459.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/4e5d2eac-be4d-4fc6-8015-eee3c1a49cc9.png b/sprites/spr_tartaros_right_trim_shadows/4e5d2eac-be4d-4fc6-8015-eee3c1a49cc9.png new file mode 100644 index 0000000000..b041c792ed Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/4e5d2eac-be4d-4fc6-8015-eee3c1a49cc9.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/93daf279-d2ce-404f-a78a-bf2452370123.png b/sprites/spr_tartaros_right_trim_shadows/93daf279-d2ce-404f-a78a-bf2452370123.png new file mode 100644 index 0000000000..81c0b4e7b8 Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/93daf279-d2ce-404f-a78a-bf2452370123.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/f0854253-f7d6-415f-a231-821c06d4b85b.png b/sprites/spr_tartaros_right_trim_shadows/f0854253-f7d6-415f-a231-821c06d4b85b.png new file mode 100644 index 0000000000..81c0b4e7b8 Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/f0854253-f7d6-415f-a231-821c06d4b85b.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/fcc398f5-9f0f-43e7-a8eb-d61aea01512a.png b/sprites/spr_tartaros_right_trim_shadows/fcc398f5-9f0f-43e7-a8eb-d61aea01512a.png new file mode 100644 index 0000000000..a406108c57 Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/fcc398f5-9f0f-43e7-a8eb-d61aea01512a.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/layers/100b29ea-fe77-4be7-9047-263452df1459/bfad4db2-459b-493b-943a-cecb6336858c.png b/sprites/spr_tartaros_right_trim_shadows/layers/100b29ea-fe77-4be7-9047-263452df1459/bfad4db2-459b-493b-943a-cecb6336858c.png new file mode 100644 index 0000000000..81c0b4e7b8 Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/layers/100b29ea-fe77-4be7-9047-263452df1459/bfad4db2-459b-493b-943a-cecb6336858c.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/layers/4e5d2eac-be4d-4fc6-8015-eee3c1a49cc9/bfad4db2-459b-493b-943a-cecb6336858c.png b/sprites/spr_tartaros_right_trim_shadows/layers/4e5d2eac-be4d-4fc6-8015-eee3c1a49cc9/bfad4db2-459b-493b-943a-cecb6336858c.png new file mode 100644 index 0000000000..b041c792ed Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/layers/4e5d2eac-be4d-4fc6-8015-eee3c1a49cc9/bfad4db2-459b-493b-943a-cecb6336858c.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/layers/93daf279-d2ce-404f-a78a-bf2452370123/bfad4db2-459b-493b-943a-cecb6336858c.png b/sprites/spr_tartaros_right_trim_shadows/layers/93daf279-d2ce-404f-a78a-bf2452370123/bfad4db2-459b-493b-943a-cecb6336858c.png new file mode 100644 index 0000000000..81c0b4e7b8 Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/layers/93daf279-d2ce-404f-a78a-bf2452370123/bfad4db2-459b-493b-943a-cecb6336858c.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/layers/f0854253-f7d6-415f-a231-821c06d4b85b/bfad4db2-459b-493b-943a-cecb6336858c.png b/sprites/spr_tartaros_right_trim_shadows/layers/f0854253-f7d6-415f-a231-821c06d4b85b/bfad4db2-459b-493b-943a-cecb6336858c.png new file mode 100644 index 0000000000..81c0b4e7b8 Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/layers/f0854253-f7d6-415f-a231-821c06d4b85b/bfad4db2-459b-493b-943a-cecb6336858c.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/layers/fcc398f5-9f0f-43e7-a8eb-d61aea01512a/bfad4db2-459b-493b-943a-cecb6336858c.png b/sprites/spr_tartaros_right_trim_shadows/layers/fcc398f5-9f0f-43e7-a8eb-d61aea01512a/bfad4db2-459b-493b-943a-cecb6336858c.png new file mode 100644 index 0000000000..a406108c57 Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/layers/fcc398f5-9f0f-43e7-a8eb-d61aea01512a/bfad4db2-459b-493b-943a-cecb6336858c.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/spr_tartaros_right_trim_shadows.yy b/sprites/spr_tartaros_right_trim_shadows/spr_tartaros_right_trim_shadows.yy new file mode 100644 index 0000000000..cea044916e --- /dev/null +++ b/sprites/spr_tartaros_right_trim_shadows/spr_tartaros_right_trim_shadows.yy @@ -0,0 +1,108 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_right_trim_shadows", + "bboxMode":0, + "bbox_bottom":93, + "bbox_left":11, + "bbox_right":57, + "bbox_top":46, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"4e5d2eac-be4d-4fc6-8015-eee3c1a49cc9","name":"4e5d2eac-be4d-4fc6-8015-eee3c1a49cc9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fcc398f5-9f0f-43e7-a8eb-d61aea01512a","name":"fcc398f5-9f0f-43e7-a8eb-d61aea01512a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93daf279-d2ce-404f-a78a-bf2452370123","name":"93daf279-d2ce-404f-a78a-bf2452370123","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0854253-f7d6-415f-a231-821c06d4b85b","name":"f0854253-f7d6-415f-a231-821c06d4b85b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"100b29ea-fe77-4be7-9047-263452df1459","name":"100b29ea-fe77-4be7-9047-263452df1459","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"bfad4db2-459b-493b-943a-cecb6336858c","blendMode":0,"displayName":"default","isLocked":false,"name":"bfad4db2-459b-493b-943a-cecb6336858c","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_right_trim_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"tartaros_complex", + "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_tartaros_right_trim_shadows", + "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":5.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tartaros_right_trim_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.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":"4e5d2eac-be4d-4fc6-8015-eee3c1a49cc9","path":"sprites/spr_tartaros_right_trim_shadows/spr_tartaros_right_trim_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f5ac5148-8ab5-4fb1-81e5-f079d5797165","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcc398f5-9f0f-43e7-a8eb-d61aea01512a","path":"sprites/spr_tartaros_right_trim_shadows/spr_tartaros_right_trim_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a79add2e-68ca-41c2-b22a-70f4087bb6c4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93daf279-d2ce-404f-a78a-bf2452370123","path":"sprites/spr_tartaros_right_trim_shadows/spr_tartaros_right_trim_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2ec1b88a-2ae1-479a-983e-921019b57728","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0854253-f7d6-415f-a231-821c06d4b85b","path":"sprites/spr_tartaros_right_trim_shadows/spr_tartaros_right_trim_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7e34c074-c6e9-4d58-b2ca-308716ac64f7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"100b29ea-fe77-4be7-9047-263452df1459","path":"sprites/spr_tartaros_right_trim_shadows/spr_tartaros_right_trim_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3e8ca64d-0de9-46a5-8e65-8be73363f418","IsCreationKey":false,"Key":4.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":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_tartaros_shadows/548e11a0-6b13-4fa6-93be-4121736d914f.png b/sprites/spr_tartaros_shadows/548e11a0-6b13-4fa6-93be-4121736d914f.png index 1f0e1c8e03..e7bb9bdc64 100644 Binary files a/sprites/spr_tartaros_shadows/548e11a0-6b13-4fa6-93be-4121736d914f.png and b/sprites/spr_tartaros_shadows/548e11a0-6b13-4fa6-93be-4121736d914f.png differ diff --git a/sprites/spr_tartaros_shadows/layers/548e11a0-6b13-4fa6-93be-4121736d914f/229b5182-d233-4896-9f67-630367846af5.png b/sprites/spr_tartaros_shadows/layers/548e11a0-6b13-4fa6-93be-4121736d914f/229b5182-d233-4896-9f67-630367846af5.png index 1f0e1c8e03..ac1fa5318f 100644 Binary files a/sprites/spr_tartaros_shadows/layers/548e11a0-6b13-4fa6-93be-4121736d914f/229b5182-d233-4896-9f67-630367846af5.png and b/sprites/spr_tartaros_shadows/layers/548e11a0-6b13-4fa6-93be-4121736d914f/229b5182-d233-4896-9f67-630367846af5.png differ diff --git a/sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy b/sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy index 445ab3a2a6..ec0010c582 100644 --- a/sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy +++ b/sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy b/sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy index fdb2b346fb..c68ddf7584 100644 --- a/sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy +++ b/sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy @@ -73,15 +73,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97633e3e-4ebd-40db-8025-98da3c2b143c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cedac6a9-8433-4874-9826-4e74be9a9e2b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74192f69-3886-451a-a93e-9abf268c1261","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a1b564d7-57a3-40f7-923e-4160b723d7d6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"893636fd-19a3-4e79-adaf-0dac89d583cc","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6f50b1f-956f-44e6-9523-5db8a5e3256b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"97633e3e-4ebd-40db-8025-98da3c2b143c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"cedac6a9-8433-4874-9826-4e74be9a9e2b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74192f69-3886-451a-a93e-9abf268c1261","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a1b564d7-57a3-40f7-923e-4160b723d7d6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"893636fd-19a3-4e79-adaf-0dac89d583cc","path":"sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f6f50b1f-956f-44e6-9523-5db8a5e3256b","IsCreationKey":false,"Key":3.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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy b/sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy index 6008420f7c..aedc21e108 100644 --- a/sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy +++ b/sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy @@ -73,15 +73,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"47ed6b6a-ba69-4655-b4b6-17efb8e432a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26bb37d5-04d2-4575-9670-987d78702f28","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74192f69-3886-451a-a93e-9abf268c1261","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e197228-ad48-480d-90c7-2072036bcf55","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"893636fd-19a3-4e79-adaf-0dac89d583cc","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"59b70244-1420-4cad-89ef-a92f6b074fd2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"47ed6b6a-ba69-4655-b4b6-17efb8e432a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"26bb37d5-04d2-4575-9670-987d78702f28","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74192f69-3886-451a-a93e-9abf268c1261","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7e197228-ad48-480d-90c7-2072036bcf55","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"893636fd-19a3-4e79-adaf-0dac89d583cc","path":"sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"59b70244-1420-4cad-89ef-a92f6b074fd2","IsCreationKey":false,"Key":3.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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_weapon_assca/spr_weapon_assca.yy b/sprites/spr_weapon_assca/spr_weapon_assca.yy index 03789cc90e..9e708bb475 100644 --- a/sprites/spr_weapon_assca/spr_weapon_assca.yy +++ b/sprites/spr_weapon_assca/spr_weapon_assca.yy @@ -64,19 +64,25 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":221.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":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","path":"sprites/spr_weapon_assca/spr_weapon_assca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a70e668f-46f5-4a71-adcd-b6ccda209baf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"21efedf4-9277-4473-97ad-ebd8ccfaaf83","path":"sprites/spr_weapon_assca/spr_weapon_assca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"904595b0-7b9a-4da8-81d1-1f2b0191245c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","path":"sprites/spr_weapon_assca/spr_weapon_assca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a70e668f-46f5-4a71-adcd-b6ccda209baf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"21efedf4-9277-4473-97ad-ebd8ccfaaf83","path":"sprites/spr_weapon_assca/spr_weapon_assca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"904595b0-7b9a-4da8-81d1-1f2b0191245c","IsCreationKey":false,"Key":1.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":27, - "yorigin":38, + "xorigin":20, + "yorigin":30, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy b/sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy index 8efd6f9373..3d1624c555 100644 --- a/sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy +++ b/sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy @@ -65,18 +65,24 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":221.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":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","path":"sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c2388d3e-d30e-46b1-a568-dd53914a27be","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","path":"sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97a52d30-b572-4541-8f4c-46d0ee48254e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","path":"sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c2388d3e-d30e-46b1-a568-dd53914a27be","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","path":"sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"97a52d30-b572-4541-8f4c-46d0ee48254e","IsCreationKey":false,"Key":1.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":27, + "xorigin":20, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_weapon_boltstorm_gauntlet_shadows/8e090f2a-a77c-4b20-b80c-d231322ff1f1.png b/sprites/spr_weapon_boltstorm_gauntlet_shadows/8e090f2a-a77c-4b20-b80c-d231322ff1f1.png new file mode 100644 index 0000000000..e62009005e Binary files /dev/null and b/sprites/spr_weapon_boltstorm_gauntlet_shadows/8e090f2a-a77c-4b20-b80c-d231322ff1f1.png differ diff --git a/sprites/spr_weapon_boltstorm_gauntlet_shadows/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png b/sprites/spr_weapon_boltstorm_gauntlet_shadows/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png new file mode 100644 index 0000000000..539404c228 Binary files /dev/null and b/sprites/spr_weapon_boltstorm_gauntlet_shadows/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png differ diff --git a/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/8e090f2a-a77c-4b20-b80c-d231322ff1f1/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png b/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/8e090f2a-a77c-4b20-b80c-d231322ff1f1/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png new file mode 100644 index 0000000000..e9aaa3547b Binary files /dev/null and b/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/8e090f2a-a77c-4b20-b80c-d231322ff1f1/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png differ diff --git a/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/8e090f2a-a77c-4b20-b80c-d231322ff1f1/b2ef360d-eaaf-4dfa-9281-5566cda46ec2.png b/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/8e090f2a-a77c-4b20-b80c-d231322ff1f1/b2ef360d-eaaf-4dfa-9281-5566cda46ec2.png new file mode 100644 index 0000000000..9a98369e52 Binary files /dev/null and b/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/8e090f2a-a77c-4b20-b80c-d231322ff1f1/b2ef360d-eaaf-4dfa-9281-5566cda46ec2.png differ diff --git a/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png b/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png new file mode 100644 index 0000000000..28cfaaffcf Binary files /dev/null and b/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png differ diff --git a/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/b2ef360d-eaaf-4dfa-9281-5566cda46ec2.png b/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/b2ef360d-eaaf-4dfa-9281-5566cda46ec2.png new file mode 100644 index 0000000000..09ff7f6b7a Binary files /dev/null and b/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/b2ef360d-eaaf-4dfa-9281-5566cda46ec2.png differ diff --git a/sprites/spr_weapon_boltstorm_gauntlet_shadows/spr_weapon_boltstorm_gauntlet_shadows.yy b/sprites/spr_weapon_boltstorm_gauntlet_shadows/spr_weapon_boltstorm_gauntlet_shadows.yy new file mode 100644 index 0000000000..483a48a7ba --- /dev/null +++ b/sprites/spr_weapon_boltstorm_gauntlet_shadows/spr_weapon_boltstorm_gauntlet_shadows.yy @@ -0,0 +1,97 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_boltstorm_gauntlet_shadows", + "bboxMode":0, + "bbox_bottom":188, + "bbox_left":3, + "bbox_right":217, + "bbox_top":118, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":262, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"a21d01bb-7c16-4f98-8ff5-fe8c08bdac52","blendMode":0,"displayName":"default","isLocked":false,"name":"a21d01bb-7c16-4f98-8ff5-fe8c08bdac52","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"b2ef360d-eaaf-4dfa-9281-5566cda46ec2","blendMode":0,"displayName":"pasteLayer","isLocked":false,"name":"b2ef360d-eaaf-4dfa-9281-5566cda46ec2","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_boltstorm_gauntlet_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"weapons_terminator", + "path":"folders/Sprites/Marine Viewer/weapons_terminator.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_boltstorm_gauntlet_shadows", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_boltstorm_gauntlet_shadows", + "playback":1, + "playbackSpeed":2.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":221.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":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","path":"sprites/spr_weapon_boltstorm_gauntlet_shadows/spr_weapon_boltstorm_gauntlet_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c2388d3e-d30e-46b1-a568-dd53914a27be","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","path":"sprites/spr_weapon_boltstorm_gauntlet_shadows/spr_weapon_boltstorm_gauntlet_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"97a52d30-b572-4541-8f4c-46d0ee48254e","IsCreationKey":false,"Key":1.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":20, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":221, +} \ No newline at end of file diff --git a/sprites/spr_weapon_chainfist/14f21d91-8b62-4ba2-8899-49d496bd87a1.png b/sprites/spr_weapon_chainfist/14f21d91-8b62-4ba2-8899-49d496bd87a1.png index 03cc118e86..7e68ddb7c6 100644 Binary files a/sprites/spr_weapon_chainfist/14f21d91-8b62-4ba2-8899-49d496bd87a1.png and b/sprites/spr_weapon_chainfist/14f21d91-8b62-4ba2-8899-49d496bd87a1.png differ diff --git a/sprites/spr_weapon_chainfist/33dc232c-077a-436b-a8c8-a0f1d5790709.png b/sprites/spr_weapon_chainfist/33dc232c-077a-436b-a8c8-a0f1d5790709.png index a5f21a8cb7..ba8dfe206d 100644 Binary files a/sprites/spr_weapon_chainfist/33dc232c-077a-436b-a8c8-a0f1d5790709.png and b/sprites/spr_weapon_chainfist/33dc232c-077a-436b-a8c8-a0f1d5790709.png differ diff --git a/sprites/spr_weapon_chainfist/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png b/sprites/spr_weapon_chainfist/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png index 3f42b4aa1e..7e68ddb7c6 100644 Binary files a/sprites/spr_weapon_chainfist/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png and b/sprites/spr_weapon_chainfist/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png differ diff --git a/sprites/spr_weapon_chainfist/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png b/sprites/spr_weapon_chainfist/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png index 9070ab83d5..ba8dfe206d 100644 Binary files a/sprites/spr_weapon_chainfist/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png and b/sprites/spr_weapon_chainfist/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png differ diff --git a/sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy b/sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy index 43f7308d14..492bc6e1df 100644 --- a/sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy +++ b/sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy @@ -65,18 +65,24 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":221.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":"33dc232c-077a-436b-a8c8-a0f1d5790709","path":"sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2aca1500-1e46-48ba-8d39-8832199ad865","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","path":"sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad3078d7-4d64-4c24-b5db-17c175c043d1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"33dc232c-077a-436b-a8c8-a0f1d5790709","path":"sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2aca1500-1e46-48ba-8d39-8832199ad865","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","path":"sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ad3078d7-4d64-4c24-b5db-17c175c043d1","IsCreationKey":false,"Key":1.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":27, + "xorigin":20, "yorigin":42, }, "swatchColours":null, diff --git a/sprites/spr_weapon_chainfist_shadows/14f21d91-8b62-4ba2-8899-49d496bd87a1.png b/sprites/spr_weapon_chainfist_shadows/14f21d91-8b62-4ba2-8899-49d496bd87a1.png new file mode 100644 index 0000000000..bb6635c9b8 Binary files /dev/null and b/sprites/spr_weapon_chainfist_shadows/14f21d91-8b62-4ba2-8899-49d496bd87a1.png differ diff --git a/sprites/spr_weapon_chainfist_shadows/33dc232c-077a-436b-a8c8-a0f1d5790709.png b/sprites/spr_weapon_chainfist_shadows/33dc232c-077a-436b-a8c8-a0f1d5790709.png new file mode 100644 index 0000000000..d984affdeb Binary files /dev/null and b/sprites/spr_weapon_chainfist_shadows/33dc232c-077a-436b-a8c8-a0f1d5790709.png differ diff --git a/sprites/spr_weapon_chainfist_shadows/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png b/sprites/spr_weapon_chainfist_shadows/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png new file mode 100644 index 0000000000..bb6635c9b8 Binary files /dev/null and b/sprites/spr_weapon_chainfist_shadows/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png differ diff --git a/sprites/spr_weapon_chainfist_shadows/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/5d4201b0-3c51-4b59-bcde-6d726e214b64.png b/sprites/spr_weapon_chainfist_shadows/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/5d4201b0-3c51-4b59-bcde-6d726e214b64.png new file mode 100644 index 0000000000..79cfd74396 Binary files /dev/null and b/sprites/spr_weapon_chainfist_shadows/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/5d4201b0-3c51-4b59-bcde-6d726e214b64.png differ diff --git a/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png b/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png new file mode 100644 index 0000000000..d984affdeb Binary files /dev/null and b/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png differ diff --git a/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/5d4201b0-3c51-4b59-bcde-6d726e214b64.png b/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/5d4201b0-3c51-4b59-bcde-6d726e214b64.png new file mode 100644 index 0000000000..3a8fb4658b Binary files /dev/null and b/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/5d4201b0-3c51-4b59-bcde-6d726e214b64.png differ diff --git a/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/5db4aa6b-c505-41f8-abee-53cfabe27885.png b/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/5db4aa6b-c505-41f8-abee-53cfabe27885.png new file mode 100644 index 0000000000..3578cc5250 Binary files /dev/null and b/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/5db4aa6b-c505-41f8-abee-53cfabe27885.png differ diff --git a/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/aaadcd6e-2015-4e18-94cb-fe99bcbb9134.png b/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/aaadcd6e-2015-4e18-94cb-fe99bcbb9134.png new file mode 100644 index 0000000000..1c9e787629 Binary files /dev/null and b/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/aaadcd6e-2015-4e18-94cb-fe99bcbb9134.png differ diff --git a/sprites/spr_weapon_chainfist_shadows/spr_weapon_chainfist_shadows.yy b/sprites/spr_weapon_chainfist_shadows/spr_weapon_chainfist_shadows.yy new file mode 100644 index 0000000000..41a95c65eb --- /dev/null +++ b/sprites/spr_weapon_chainfist_shadows/spr_weapon_chainfist_shadows.yy @@ -0,0 +1,97 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_chainfist_shadows", + "bboxMode":0, + "bbox_bottom":238, + "bbox_left":5, + "bbox_right":215, + "bbox_top":118, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"33dc232c-077a-436b-a8c8-a0f1d5790709","name":"33dc232c-077a-436b-a8c8-a0f1d5790709","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":262, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"1385643a-0ec8-4f25-9bc7-7ce770ecd73a","blendMode":0,"displayName":"pasteLayer","isLocked":false,"name":"1385643a-0ec8-4f25-9bc7-7ce770ecd73a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"5d4201b0-3c51-4b59-bcde-6d726e214b64","blendMode":0,"displayName":"default","isLocked":false,"name":"5d4201b0-3c51-4b59-bcde-6d726e214b64","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_chainfist_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"weapons_terminator", + "path":"folders/Sprites/Marine Viewer/weapons_terminator.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_chainfist_shadows", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_chainfist_shadows", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":221.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":"33dc232c-077a-436b-a8c8-a0f1d5790709","path":"sprites/spr_weapon_chainfist_shadows/spr_weapon_chainfist_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2aca1500-1e46-48ba-8d39-8832199ad865","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","path":"sprites/spr_weapon_chainfist_shadows/spr_weapon_chainfist_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ad3078d7-4d64-4c24-b5db-17c175c043d1","IsCreationKey":false,"Key":1.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":20, + "yorigin":42, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":221, +} \ No newline at end of file diff --git a/sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy b/sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy index a18dfcd960..812f104ca4 100644 --- a/sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy +++ b/sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy @@ -71,14 +71,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","path":"sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44d8813a-3fb2-4aac-b6c2-003670c82a97","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3458bbca-83b5-4d11-82fc-4c5ec0ec0153","path":"sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7eec815d-8d91-4478-bd93-cffb5873d8a6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","path":"sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"44d8813a-3fb2-4aac-b6c2-003670c82a97","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3458bbca-83b5-4d11-82fc-4c5ec0ec0153","path":"sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7eec815d-8d91-4478-bd93-cffb5873d8a6","IsCreationKey":false,"Key":1.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":27, - "yorigin":38, + "xorigin":20, + "yorigin":30, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_weapon_lightning2/c9653695-b70a-4b29-8291-cce821c9115f.png b/sprites/spr_weapon_lightning2/c9653695-b70a-4b29-8291-cce821c9115f.png index c8ac60919a..b7eef51075 100644 Binary files a/sprites/spr_weapon_lightning2/c9653695-b70a-4b29-8291-cce821c9115f.png and b/sprites/spr_weapon_lightning2/c9653695-b70a-4b29-8291-cce821c9115f.png differ diff --git a/sprites/spr_weapon_lightning2/layers/c9653695-b70a-4b29-8291-cce821c9115f/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png b/sprites/spr_weapon_lightning2/layers/c9653695-b70a-4b29-8291-cce821c9115f/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png index c8ac60919a..b7eef51075 100644 Binary files a/sprites/spr_weapon_lightning2/layers/c9653695-b70a-4b29-8291-cce821c9115f/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png and b/sprites/spr_weapon_lightning2/layers/c9653695-b70a-4b29-8291-cce821c9115f/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png differ diff --git a/sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy b/sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy index 1915ab06e1..d8171a60fe 100644 --- a/sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy +++ b/sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy @@ -64,18 +64,24 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":221.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":"c9653695-b70a-4b29-8291-cce821c9115f","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0986b23f-598a-4bf0-b8a2-77a37ff8a0f2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"55509048-bb06-4c81-8f41-961cde83eacc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9653695-b70a-4b29-8291-cce821c9115f","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0986b23f-598a-4bf0-b8a2-77a37ff8a0f2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"55509048-bb06-4c81-8f41-961cde83eacc","IsCreationKey":false,"Key":1.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":27, + "xorigin":20, "yorigin":42, }, "swatchColours":null, diff --git a/sprites/spr_weapon_lightning2_shadows/3b7f909d-5ebb-4c2b-b818-ed5cf4504109.png b/sprites/spr_weapon_lightning2_shadows/3b7f909d-5ebb-4c2b-b818-ed5cf4504109.png new file mode 100644 index 0000000000..d538c8be52 Binary files /dev/null and b/sprites/spr_weapon_lightning2_shadows/3b7f909d-5ebb-4c2b-b818-ed5cf4504109.png differ diff --git a/sprites/spr_weapon_lightning2_shadows/c9653695-b70a-4b29-8291-cce821c9115f.png b/sprites/spr_weapon_lightning2_shadows/c9653695-b70a-4b29-8291-cce821c9115f.png new file mode 100644 index 0000000000..3ad753a6dd Binary files /dev/null and b/sprites/spr_weapon_lightning2_shadows/c9653695-b70a-4b29-8291-cce821c9115f.png differ diff --git a/sprites/spr_weapon_lightning2_shadows/layers/3b7f909d-5ebb-4c2b-b818-ed5cf4504109/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png b/sprites/spr_weapon_lightning2_shadows/layers/3b7f909d-5ebb-4c2b-b818-ed5cf4504109/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png new file mode 100644 index 0000000000..d538c8be52 Binary files /dev/null and b/sprites/spr_weapon_lightning2_shadows/layers/3b7f909d-5ebb-4c2b-b818-ed5cf4504109/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png differ diff --git a/sprites/spr_weapon_lightning2_shadows/layers/c9653695-b70a-4b29-8291-cce821c9115f/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png b/sprites/spr_weapon_lightning2_shadows/layers/c9653695-b70a-4b29-8291-cce821c9115f/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png new file mode 100644 index 0000000000..3ad753a6dd Binary files /dev/null and b/sprites/spr_weapon_lightning2_shadows/layers/c9653695-b70a-4b29-8291-cce821c9115f/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png differ diff --git a/sprites/spr_weapon_lightning2_shadows/spr_weapon_lightning2_shadows.yy b/sprites/spr_weapon_lightning2_shadows/spr_weapon_lightning2_shadows.yy new file mode 100644 index 0000000000..74db098007 --- /dev/null +++ b/sprites/spr_weapon_lightning2_shadows/spr_weapon_lightning2_shadows.yy @@ -0,0 +1,96 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_lightning2_shadows", + "bboxMode":0, + "bbox_bottom":213, + "bbox_left":18, + "bbox_right":202, + "bbox_top":118, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"c9653695-b70a-4b29-8291-cce821c9115f","name":"c9653695-b70a-4b29-8291-cce821c9115f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":262, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"6b78fafc-510d-4b93-90fa-40d14bd3c0ce","blendMode":0,"displayName":"default","isLocked":false,"name":"6b78fafc-510d-4b93-90fa-40d14bd3c0ce","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_lightning2_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"weapons_terminator", + "path":"folders/Sprites/Marine Viewer/weapons_terminator.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_lightning2_shadows", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_lightning2_shadows", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":221.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":"c9653695-b70a-4b29-8291-cce821c9115f","path":"sprites/spr_weapon_lightning2_shadows/spr_weapon_lightning2_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0986b23f-598a-4bf0-b8a2-77a37ff8a0f2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","path":"sprites/spr_weapon_lightning2_shadows/spr_weapon_lightning2_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"55509048-bb06-4c81-8f41-961cde83eacc","IsCreationKey":false,"Key":1.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":20, + "yorigin":42, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":221, +} \ No newline at end of file diff --git a/sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy b/sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy index 4ebd435371..4cab20e06c 100644 --- a/sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy +++ b/sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy @@ -71,13 +71,17 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6ff589f-4704-4be6-bb05-636239790be6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3de42d5-27c7-4349-82ce-0d82b0f1b555","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2caa7e10-26a7-4146-b122-b0d0df872c4f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b6ff589f-4704-4be6-bb05-636239790be6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3de42d5-27c7-4349-82ce-0d82b0f1b555","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2caa7e10-26a7-4146-b122-b0d0df872c4f","IsCreationKey":false,"Key":1.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":27, + "xorigin":20, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_weapon_powfist4/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png b/sprites/spr_weapon_powfist4/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png index 6e4bc47e4d..130ee528ac 100644 Binary files a/sprites/spr_weapon_powfist4/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png and b/sprites/spr_weapon_powfist4/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png differ diff --git a/sprites/spr_weapon_powfist4/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png b/sprites/spr_weapon_powfist4/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png index 6e4bc47e4d..130ee528ac 100644 Binary files a/sprites/spr_weapon_powfist4/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png and b/sprites/spr_weapon_powfist4/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png differ diff --git a/sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy b/sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy index cbe822c20f..abe6085e9b 100644 --- a/sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy +++ b/sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy @@ -64,18 +64,24 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":181.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":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","path":"sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"47151b1c-9cef-45fe-883f-ffbcadc946d8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","path":"sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a0047329-f211-4ad9-9557-0d0295d68efc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","path":"sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"47151b1c-9cef-45fe-883f-ffbcadc946d8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","path":"sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a0047329-f211-4ad9-9557-0d0295d68efc","IsCreationKey":false,"Key":1.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":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_weapon_powfist4_shadows/4410e334-93f0-4b8b-8b06-2247349c1ba2.png b/sprites/spr_weapon_powfist4_shadows/4410e334-93f0-4b8b-8b06-2247349c1ba2.png new file mode 100644 index 0000000000..f4cfa3f307 Binary files /dev/null and b/sprites/spr_weapon_powfist4_shadows/4410e334-93f0-4b8b-8b06-2247349c1ba2.png differ diff --git a/sprites/spr_weapon_powfist4_shadows/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png b/sprites/spr_weapon_powfist4_shadows/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png new file mode 100644 index 0000000000..dbb238e683 Binary files /dev/null and b/sprites/spr_weapon_powfist4_shadows/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png differ diff --git a/sprites/spr_weapon_powfist4_shadows/layers/4410e334-93f0-4b8b-8b06-2247349c1ba2/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png b/sprites/spr_weapon_powfist4_shadows/layers/4410e334-93f0-4b8b-8b06-2247349c1ba2/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png new file mode 100644 index 0000000000..f4cfa3f307 Binary files /dev/null and b/sprites/spr_weapon_powfist4_shadows/layers/4410e334-93f0-4b8b-8b06-2247349c1ba2/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png differ diff --git a/sprites/spr_weapon_powfist4_shadows/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png b/sprites/spr_weapon_powfist4_shadows/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png new file mode 100644 index 0000000000..dbb238e683 Binary files /dev/null and b/sprites/spr_weapon_powfist4_shadows/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png differ diff --git a/sprites/spr_weapon_powfist4_shadows/spr_weapon_powfist4_shadows.yy b/sprites/spr_weapon_powfist4_shadows/spr_weapon_powfist4_shadows.yy new file mode 100644 index 0000000000..6abb6f4ad1 --- /dev/null +++ b/sprites/spr_weapon_powfist4_shadows/spr_weapon_powfist4_shadows.yy @@ -0,0 +1,96 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_powfist4_shadows", + "bboxMode":0, + "bbox_bottom":188, + "bbox_left":1, + "bbox_right":179, + "bbox_top":118, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":262, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"a21d01bb-7c16-4f98-8ff5-fe8c08bdac52","blendMode":0,"displayName":"default","isLocked":false,"name":"a21d01bb-7c16-4f98-8ff5-fe8c08bdac52","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_powfist4_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"weapons_terminator", + "path":"folders/Sprites/Marine Viewer/weapons_terminator.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_powfist4_shadows", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_powfist4_shadows", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":181.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":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","path":"sprites/spr_weapon_powfist4_shadows/spr_weapon_powfist4_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"47151b1c-9cef-45fe-883f-ffbcadc946d8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","path":"sprites/spr_weapon_powfist4_shadows/spr_weapon_powfist4_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a0047329-f211-4ad9-9557-0d0295d68efc","IsCreationKey":false,"Key":1.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":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy b/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy index 713baba12d..e6d328a315 100644 --- a/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy +++ b/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy @@ -63,12 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.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":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","path":"sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f46c285-35b1-4a8e-b996-6405ca743092","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","path":"sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6f46c285-35b1-4a8e-b996-6405ca743092","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_weapon_volkite_culverin_term/spr_weapon_volkite_culverin_term.yy b/sprites/spr_weapon_volkite_culverin_term/spr_weapon_volkite_culverin_term.yy index 02d2dfc73c..9560c5517a 100644 --- a/sprites/spr_weapon_volkite_culverin_term/spr_weapon_volkite_culverin_term.yy +++ b/sprites/spr_weapon_volkite_culverin_term/spr_weapon_volkite_culverin_term.yy @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":27, + "xorigin":20, "yorigin":38, }, "swatchColours":null,