diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 76d15b730d..a11053e091 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1640,12 +1640,19 @@ {"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",},}, {"id":{"name":"spr_tartaros_faceplate","path":"sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy",},}, + {"id":{"name":"spr_tartaros_forehead_shadows","path":"sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy",},}, + {"id":{"name":"spr_tartaros_forehead_variants","path":"sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy",},}, + {"id":{"name":"spr_tartaros_gorget_shadows","path":"sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy",},}, {"id":{"name":"spr_tartaros_gorget","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},}, + {"id":{"name":"spr_tartaros_head_shadows","path":"sprites/spr_tartaros_head_shadows/spr_tartaros_head_shadows.yy",},}, {"id":{"name":"spr_tartaros_head_variants","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},}, {"id":{"name":"spr_tartaros_left_arm","path":"sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy",},}, {"id":{"name":"spr_tartaros_left_leg","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},}, {"id":{"name":"spr_tartaros_left_trim","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},}, + {"id":{"name":"spr_tartaros_leg_rivets","path":"sprites/spr_tartaros_leg_rivets/spr_tartaros_leg_rivets.yy",},}, + {"id":{"name":"spr_tartaros_right_arm_shadows","path":"sprites/spr_tartaros_right_arm_shadows/spr_tartaros_right_arm_shadows.yy",},}, {"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","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",},}, diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 6edf1a1ae4..ca9f15a2c4 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -1342,14 +1342,8 @@ function ComplexSet(_unit) constructor { break; case "Tartaros": add_group({ - left_arm: spr_tartaros_left_arm, - right_arm: spr_tartaros_right_arm, - right_leg: spr_tartaros_right_leg, - left_leg: spr_tartaros_left_leg, chest_variants: spr_tartaros_chest, - gorget: spr_tartaros_gorget, mouth_variants: spr_tartaros_faceplate, - head: spr_tartaros_head_variants, left_trim: spr_tartaros_left_trim, right_trim: spr_tartaros_right_trim }); diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 5205f6f6da..cbdf053976 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -329,6 +329,7 @@ function set_up_visual_overides(){ shader_set(right_left_swap_shader); _flip_mod.sprite = return_sprite_mirrored(_mod.sprite, false); + //sprite_set_offset(_flip_mod.sprite,sprite_get_xoffset(_mod.sprite),sprite_get_yoffset(_mod.sprite)); if (struct_exists(_flip_mod, "subcomponents")){ @@ -1434,7 +1435,47 @@ global.modular_drawing_items = [ sprite : spr_tartaros_complex, shadows : spr_tartaros_shadows, body_types : [2], - } + }, + { + position : "right_arm", + armours : ["Tartaros"], + sprite : spr_tartaros_right_arm, + shadows : spr_tartaros_right_arm_shadows, + body_types : [2], + flip : true, + }, + { + position : "gorget", + armours : ["Tartaros"], + sprite : spr_tartaros_gorget, + shadows : spr_tartaros_gorget_shadows, + body_types : [2], + }, + { + position : "head", + armours : ["Tartaros"], + sprite : spr_tartaros_head_variants, + shadows : spr_tartaros_head_shadows, + body_types : [2], + }, + { + position : "forehead", + armours : ["Tartaros"], + sprite : spr_tartaros_forehead_variants, + shadows : spr_tartaros_forehead_shadows, + body_types : [2], + }, + { + position : "right_leg", + armours : ["Tartaros"], + sprite : spr_tartaros_right_leg, + shadows : spr_tartaros_right_leg_shadows, + body_types : [2], + flip : true, + subcomponents : [ + [spr_blank, spr_blank,spr_blank,spr_tartaros_leg_rivets], + ], + }, ]; diff --git a/sprites/spr_tartaros_forehead_shadows/40bc99d5-36c6-494f-ac41-97db7b1af50a.png b/sprites/spr_tartaros_forehead_shadows/40bc99d5-36c6-494f-ac41-97db7b1af50a.png new file mode 100644 index 0000000000..04fed7e84f Binary files /dev/null and b/sprites/spr_tartaros_forehead_shadows/40bc99d5-36c6-494f-ac41-97db7b1af50a.png differ diff --git a/sprites/spr_tartaros_forehead_shadows/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png b/sprites/spr_tartaros_forehead_shadows/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png new file mode 100644 index 0000000000..3b57f13a9a Binary files /dev/null and b/sprites/spr_tartaros_forehead_shadows/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png differ diff --git a/sprites/spr_tartaros_forehead_shadows/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png b/sprites/spr_tartaros_forehead_shadows/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png new file mode 100644 index 0000000000..5a9db12b6f Binary files /dev/null and b/sprites/spr_tartaros_forehead_shadows/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png differ diff --git a/sprites/spr_tartaros_forehead_shadows/fd6650e0-331d-4ca5-8853-0b5406c4134d.png b/sprites/spr_tartaros_forehead_shadows/fd6650e0-331d-4ca5-8853-0b5406c4134d.png new file mode 100644 index 0000000000..7c1af4a7dd Binary files /dev/null and b/sprites/spr_tartaros_forehead_shadows/fd6650e0-331d-4ca5-8853-0b5406c4134d.png differ diff --git a/sprites/spr_tartaros_forehead_shadows/layers/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_forehead_shadows/layers/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png new file mode 100644 index 0000000000..04fed7e84f Binary files /dev/null and b/sprites/spr_tartaros_forehead_shadows/layers/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png differ diff --git a/sprites/spr_tartaros_forehead_shadows/layers/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_forehead_shadows/layers/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png new file mode 100644 index 0000000000..3b57f13a9a Binary files /dev/null and b/sprites/spr_tartaros_forehead_shadows/layers/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png differ diff --git a/sprites/spr_tartaros_forehead_shadows/layers/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_forehead_shadows/layers/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png new file mode 100644 index 0000000000..5a9db12b6f Binary files /dev/null and b/sprites/spr_tartaros_forehead_shadows/layers/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png differ diff --git a/sprites/spr_tartaros_forehead_shadows/layers/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_forehead_shadows/layers/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png new file mode 100644 index 0000000000..ed36d9f90b Binary files /dev/null and b/sprites/spr_tartaros_forehead_shadows/layers/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png differ diff --git a/sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy b/sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy new file mode 100644 index 0000000000..863b3ae604 --- /dev/null +++ b/sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy @@ -0,0 +1,104 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_forehead_shadows", + "bboxMode":0, + "bbox_bottom":61, + "bbox_left":75, + "bbox_right":104, + "bbox_top":41, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"3156c4a2-0553-4e28-b1dd-29e32750bb31","blendMode":0,"displayName":"default","isLocked":false,"name":"3156c4a2-0553-4e28-b1dd-29e32750bb31","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_forehead_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_forehead_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":4.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tartaros_forehead_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":"fd6650e0-331d-4ca5-8853-0b5406c4134d","path":"sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1a532018-4897-4836-9f0a-ad6b2a1e1ace","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","path":"sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4519c469-956a-4220-88e4-c3fae75eb452","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","path":"sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0b0fd24a-f8f4-4417-9118-843f3e258ebc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","path":"sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5d4ff4a0-8f3e-42c8-8e21-60bfc6e311fb","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, + "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_forehead_variants/40bc99d5-36c6-494f-ac41-97db7b1af50a.png b/sprites/spr_tartaros_forehead_variants/40bc99d5-36c6-494f-ac41-97db7b1af50a.png new file mode 100644 index 0000000000..02172dc824 Binary files /dev/null and b/sprites/spr_tartaros_forehead_variants/40bc99d5-36c6-494f-ac41-97db7b1af50a.png differ diff --git a/sprites/spr_tartaros_forehead_variants/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png b/sprites/spr_tartaros_forehead_variants/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png new file mode 100644 index 0000000000..e5258e6ae9 Binary files /dev/null and b/sprites/spr_tartaros_forehead_variants/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png differ diff --git a/sprites/spr_tartaros_forehead_variants/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png b/sprites/spr_tartaros_forehead_variants/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png new file mode 100644 index 0000000000..5a55ce8f16 Binary files /dev/null and b/sprites/spr_tartaros_forehead_variants/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png differ diff --git a/sprites/spr_tartaros_forehead_variants/fd6650e0-331d-4ca5-8853-0b5406c4134d.png b/sprites/spr_tartaros_forehead_variants/fd6650e0-331d-4ca5-8853-0b5406c4134d.png new file mode 100644 index 0000000000..ed36d9f90b Binary files /dev/null and b/sprites/spr_tartaros_forehead_variants/fd6650e0-331d-4ca5-8853-0b5406c4134d.png differ diff --git a/sprites/spr_tartaros_forehead_variants/layers/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_forehead_variants/layers/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png new file mode 100644 index 0000000000..02172dc824 Binary files /dev/null and b/sprites/spr_tartaros_forehead_variants/layers/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png differ diff --git a/sprites/spr_tartaros_forehead_variants/layers/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_forehead_variants/layers/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png new file mode 100644 index 0000000000..e5258e6ae9 Binary files /dev/null and b/sprites/spr_tartaros_forehead_variants/layers/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png differ diff --git a/sprites/spr_tartaros_forehead_variants/layers/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_forehead_variants/layers/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png new file mode 100644 index 0000000000..5a55ce8f16 Binary files /dev/null and b/sprites/spr_tartaros_forehead_variants/layers/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png differ diff --git a/sprites/spr_tartaros_forehead_variants/layers/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_forehead_variants/layers/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png new file mode 100644 index 0000000000..ed36d9f90b Binary files /dev/null and b/sprites/spr_tartaros_forehead_variants/layers/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png differ diff --git a/sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy b/sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy new file mode 100644 index 0000000000..a0421b534d --- /dev/null +++ b/sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy @@ -0,0 +1,104 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_forehead_variants", + "bboxMode":0, + "bbox_bottom":61, + "bbox_left":75, + "bbox_right":104, + "bbox_top":41, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"3156c4a2-0553-4e28-b1dd-29e32750bb31","blendMode":0,"displayName":"default","isLocked":false,"name":"3156c4a2-0553-4e28-b1dd-29e32750bb31","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_forehead_variants", + "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_forehead_variants", + "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":4.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tartaros_forehead_variants", + "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":"fd6650e0-331d-4ca5-8853-0b5406c4134d","path":"sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1a532018-4897-4836-9f0a-ad6b2a1e1ace","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","path":"sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4519c469-956a-4220-88e4-c3fae75eb452","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","path":"sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0b0fd24a-f8f4-4417-9118-843f3e258ebc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","path":"sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5d4ff4a0-8f3e-42c8-8e21-60bfc6e311fb","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, + "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_gorget/spr_tartaros_gorget.yy b/sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy index 8d992146aa..571c80b373 100644 --- a/sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy +++ b/sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy @@ -66,15 +66,25 @@ "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_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9235ed8a-8884-482b-beb0-ca7bd8d76034","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7183111f-9020-46b1-8c8d-6f3863650227","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"239b9ef2-147e-4638-b8bf-9fb260690813","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5f0e39e-b410-44dc-ab65-854f6d158d85","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"060a888c-3c91-4a53-8080-9c7158db2809","IsCreationKey":false,"Key":2.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_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"17f13e4b-ebf1-48e5-a312-bc3f5a8ff078","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_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9235ed8a-8884-482b-beb0-ca7bd8d76034","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7183111f-9020-46b1-8c8d-6f3863650227","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"239b9ef2-147e-4638-b8bf-9fb260690813","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5f0e39e-b410-44dc-ab65-854f6d158d85","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"060a888c-3c91-4a53-8080-9c7158db2809","IsCreationKey":false,"Key":2.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_gorget/spr_tartaros_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"17f13e4b-ebf1-48e5-a312-bc3f5a8ff078","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_tartaros_gorget_shadows/7183111f-9020-46b1-8c8d-6f3863650227.png b/sprites/spr_tartaros_gorget_shadows/7183111f-9020-46b1-8c8d-6f3863650227.png new file mode 100644 index 0000000000..129b0af09b Binary files /dev/null and b/sprites/spr_tartaros_gorget_shadows/7183111f-9020-46b1-8c8d-6f3863650227.png differ diff --git a/sprites/spr_tartaros_gorget_shadows/7f9b6976-da75-43c8-97e3-acfa8912ef0e.png b/sprites/spr_tartaros_gorget_shadows/7f9b6976-da75-43c8-97e3-acfa8912ef0e.png new file mode 100644 index 0000000000..b9eae291e1 Binary files /dev/null and b/sprites/spr_tartaros_gorget_shadows/7f9b6976-da75-43c8-97e3-acfa8912ef0e.png differ diff --git a/sprites/spr_tartaros_gorget_shadows/8d99f92f-4aac-47e4-a142-c6ea6be47856.png b/sprites/spr_tartaros_gorget_shadows/8d99f92f-4aac-47e4-a142-c6ea6be47856.png new file mode 100644 index 0000000000..70f128ca33 Binary files /dev/null and b/sprites/spr_tartaros_gorget_shadows/8d99f92f-4aac-47e4-a142-c6ea6be47856.png differ diff --git a/sprites/spr_tartaros_gorget_shadows/ead692b6-35d8-4ebb-bc75-76c2fbfae9ef.png b/sprites/spr_tartaros_gorget_shadows/ead692b6-35d8-4ebb-bc75-76c2fbfae9ef.png new file mode 100644 index 0000000000..ef378bc642 Binary files /dev/null and b/sprites/spr_tartaros_gorget_shadows/ead692b6-35d8-4ebb-bc75-76c2fbfae9ef.png differ diff --git a/sprites/spr_tartaros_gorget_shadows/layers/7183111f-9020-46b1-8c8d-6f3863650227/50a6880d-f9bf-4734-a44b-81b675bc6761.png b/sprites/spr_tartaros_gorget_shadows/layers/7183111f-9020-46b1-8c8d-6f3863650227/50a6880d-f9bf-4734-a44b-81b675bc6761.png new file mode 100644 index 0000000000..129b0af09b Binary files /dev/null and b/sprites/spr_tartaros_gorget_shadows/layers/7183111f-9020-46b1-8c8d-6f3863650227/50a6880d-f9bf-4734-a44b-81b675bc6761.png differ diff --git a/sprites/spr_tartaros_gorget_shadows/layers/7f9b6976-da75-43c8-97e3-acfa8912ef0e/50a6880d-f9bf-4734-a44b-81b675bc6761.png b/sprites/spr_tartaros_gorget_shadows/layers/7f9b6976-da75-43c8-97e3-acfa8912ef0e/50a6880d-f9bf-4734-a44b-81b675bc6761.png new file mode 100644 index 0000000000..b9eae291e1 Binary files /dev/null and b/sprites/spr_tartaros_gorget_shadows/layers/7f9b6976-da75-43c8-97e3-acfa8912ef0e/50a6880d-f9bf-4734-a44b-81b675bc6761.png differ diff --git a/sprites/spr_tartaros_gorget_shadows/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/50a6880d-f9bf-4734-a44b-81b675bc6761.png b/sprites/spr_tartaros_gorget_shadows/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/50a6880d-f9bf-4734-a44b-81b675bc6761.png new file mode 100644 index 0000000000..70f128ca33 Binary files /dev/null and b/sprites/spr_tartaros_gorget_shadows/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/50a6880d-f9bf-4734-a44b-81b675bc6761.png differ diff --git a/sprites/spr_tartaros_gorget_shadows/layers/ead692b6-35d8-4ebb-bc75-76c2fbfae9ef/50a6880d-f9bf-4734-a44b-81b675bc6761.png b/sprites/spr_tartaros_gorget_shadows/layers/ead692b6-35d8-4ebb-bc75-76c2fbfae9ef/50a6880d-f9bf-4734-a44b-81b675bc6761.png new file mode 100644 index 0000000000..ef378bc642 Binary files /dev/null and b/sprites/spr_tartaros_gorget_shadows/layers/ead692b6-35d8-4ebb-bc75-76c2fbfae9ef/50a6880d-f9bf-4734-a44b-81b675bc6761.png differ diff --git a/sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy b/sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy new file mode 100644 index 0000000000..818c6370c3 --- /dev/null +++ b/sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy @@ -0,0 +1,104 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_gorget_shadows", + "bboxMode":0, + "bbox_bottom":87, + "bbox_left":62, + "bbox_right":117, + "bbox_top":65, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7183111f-9020-46b1-8c8d-6f3863650227","name":"7183111f-9020-46b1-8c8d-6f3863650227","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ead692b6-35d8-4ebb-bc75-76c2fbfae9ef","name":"ead692b6-35d8-4ebb-bc75-76c2fbfae9ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f9b6976-da75-43c8-97e3-acfa8912ef0e","name":"7f9b6976-da75-43c8-97e3-acfa8912ef0e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"50a6880d-f9bf-4734-a44b-81b675bc6761","blendMode":0,"displayName":"default","isLocked":false,"name":"50a6880d-f9bf-4734-a44b-81b675bc6761","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_gorget_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_gorget_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":4.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tartaros_gorget_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":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9235ed8a-8884-482b-beb0-ca7bd8d76034","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7183111f-9020-46b1-8c8d-6f3863650227","path":"sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"239b9ef2-147e-4638-b8bf-9fb260690813","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ead692b6-35d8-4ebb-bc75-76c2fbfae9ef","path":"sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"faab9019-f40d-4a3b-9335-53b1d7eb470b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f9b6976-da75-43c8-97e3-acfa8912ef0e","path":"sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c4ab6499-31ce-48c3-b639-e485f12c92de","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, + "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_head_shadows/fd6650e0-331d-4ca5-8853-0b5406c4134d.png b/sprites/spr_tartaros_head_shadows/fd6650e0-331d-4ca5-8853-0b5406c4134d.png new file mode 100644 index 0000000000..73b53b11fe Binary files /dev/null and b/sprites/spr_tartaros_head_shadows/fd6650e0-331d-4ca5-8853-0b5406c4134d.png differ diff --git a/sprites/spr_tartaros_head_shadows/layers/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_head_shadows/layers/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png new file mode 100644 index 0000000000..73b53b11fe Binary files /dev/null and b/sprites/spr_tartaros_head_shadows/layers/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png differ diff --git a/sprites/spr_tartaros_head_shadows/spr_tartaros_head_shadows.yy b/sprites/spr_tartaros_head_shadows/spr_tartaros_head_shadows.yy new file mode 100644 index 0000000000..ca96c5261a --- /dev/null +++ b/sprites/spr_tartaros_head_shadows/spr_tartaros_head_shadows.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_head_shadows", + "bboxMode":0, + "bbox_bottom":68, + "bbox_left":69, + "bbox_right":110, + "bbox_top":41, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"3156c4a2-0553-4e28-b1dd-29e32750bb31","blendMode":0,"displayName":"default","isLocked":false,"name":"3156c4a2-0553-4e28-b1dd-29e32750bb31","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_head_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_head_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_tartaros_head_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":"fd6650e0-331d-4ca5-8853-0b5406c4134d","path":"sprites/spr_tartaros_head_shadows/spr_tartaros_head_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1a532018-4897-4836-9f0a-ad6b2a1e1ace","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, + "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_head_variants/40bc99d5-36c6-494f-ac41-97db7b1af50a.png b/sprites/spr_tartaros_head_variants/40bc99d5-36c6-494f-ac41-97db7b1af50a.png deleted file mode 100644 index 7fad9d3733..0000000000 Binary files a/sprites/spr_tartaros_head_variants/40bc99d5-36c6-494f-ac41-97db7b1af50a.png and /dev/null differ diff --git a/sprites/spr_tartaros_head_variants/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png b/sprites/spr_tartaros_head_variants/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png deleted file mode 100644 index 163d09b375..0000000000 Binary files a/sprites/spr_tartaros_head_variants/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png and /dev/null differ diff --git a/sprites/spr_tartaros_head_variants/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png b/sprites/spr_tartaros_head_variants/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png deleted file mode 100644 index a51e5874e2..0000000000 Binary files a/sprites/spr_tartaros_head_variants/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png and /dev/null differ diff --git a/sprites/spr_tartaros_head_variants/layers/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_head_variants/layers/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png deleted file mode 100644 index 7fad9d3733..0000000000 Binary files a/sprites/spr_tartaros_head_variants/layers/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png and /dev/null differ diff --git a/sprites/spr_tartaros_head_variants/layers/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_head_variants/layers/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png deleted file mode 100644 index 163d09b375..0000000000 Binary files a/sprites/spr_tartaros_head_variants/layers/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png and /dev/null differ diff --git a/sprites/spr_tartaros_head_variants/layers/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_head_variants/layers/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png deleted file mode 100644 index a51e5874e2..0000000000 Binary files a/sprites/spr_tartaros_head_variants/layers/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png and /dev/null differ 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 9772841dbc..b8ffc78105 100644 --- a/sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy +++ b/sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy @@ -13,9 +13,6 @@ "For3D":false, "frames":[ {"$GMSpriteFrame":"v1","%Name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -52,7 +49,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":4.0, + "length":1.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -66,15 +63,16 @@ "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":"fd6650e0-331d-4ca5-8853-0b5406c4134d","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a532018-4897-4836-9f0a-ad6b2a1e1ace","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4519c469-956a-4220-88e4-c3fae75eb452","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b0fd24a-f8f4-4417-9118-843f3e258ebc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d4ff4a0-8f3e-42c8-8e21-60bfc6e311fb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1a532018-4897-4836-9f0a-ad6b2a1e1ace","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_tartaros_leg_rivets/b53b7c9e-26af-4c4b-9b89-a15af4f7296c.png b/sprites/spr_tartaros_leg_rivets/b53b7c9e-26af-4c4b-9b89-a15af4f7296c.png new file mode 100644 index 0000000000..fa42744b1d Binary files /dev/null and b/sprites/spr_tartaros_leg_rivets/b53b7c9e-26af-4c4b-9b89-a15af4f7296c.png differ diff --git a/sprites/spr_tartaros_leg_rivets/layers/b53b7c9e-26af-4c4b-9b89-a15af4f7296c/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_leg_rivets/layers/b53b7c9e-26af-4c4b-9b89-a15af4f7296c/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png new file mode 100644 index 0000000000..fa42744b1d Binary files /dev/null and b/sprites/spr_tartaros_leg_rivets/layers/b53b7c9e-26af-4c4b-9b89-a15af4f7296c/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png differ diff --git a/sprites/spr_tartaros_leg_rivets/spr_tartaros_leg_rivets.yy b/sprites/spr_tartaros_leg_rivets/spr_tartaros_leg_rivets.yy new file mode 100644 index 0000000000..28e58cd5a5 --- /dev/null +++ b/sprites/spr_tartaros_leg_rivets/spr_tartaros_leg_rivets.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_leg_rivets", + "bboxMode":0, + "bbox_bottom":218, + "bbox_left":32, + "bbox_right":66, + "bbox_top":173, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"b1ad68ac-732f-42d2-971e-e7f6a4962e33","blendMode":0,"displayName":"default","isLocked":false,"name":"b1ad68ac-732f-42d2-971e-e7f6a4962e33","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_leg_rivets", + "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_leg_rivets", + "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_tartaros_leg_rivets", + "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":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","path":"sprites/spr_tartaros_leg_rivets/spr_tartaros_leg_rivets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6b8fc32b-fe8a-41b2-8970-72f6bd2a6892","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, + "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_right_arm/spr_tartaros_right_arm.yy b/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy index 1e03b05d9b..e1b5fc4e3c 100644 --- a/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy +++ b/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy @@ -63,12 +63,16 @@ "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":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","path":"sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9665fe9-f2cc-4a6a-9121-57006f1160f8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","path":"sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f9665fe9-f2cc-4a6a-9121-57006f1160f8","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_tartaros_right_arm_shadows/87c9365b-ef0b-48e1-a764-b2b2b8937c67.png b/sprites/spr_tartaros_right_arm_shadows/87c9365b-ef0b-48e1-a764-b2b2b8937c67.png new file mode 100644 index 0000000000..943375828b Binary files /dev/null and b/sprites/spr_tartaros_right_arm_shadows/87c9365b-ef0b-48e1-a764-b2b2b8937c67.png differ diff --git a/sprites/spr_tartaros_right_arm_shadows/layers/87c9365b-ef0b-48e1-a764-b2b2b8937c67/c87e73e1-e866-4b39-8a1f-96167acb2eca.png b/sprites/spr_tartaros_right_arm_shadows/layers/87c9365b-ef0b-48e1-a764-b2b2b8937c67/c87e73e1-e866-4b39-8a1f-96167acb2eca.png new file mode 100644 index 0000000000..943375828b Binary files /dev/null and b/sprites/spr_tartaros_right_arm_shadows/layers/87c9365b-ef0b-48e1-a764-b2b2b8937c67/c87e73e1-e866-4b39-8a1f-96167acb2eca.png differ 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 new file mode 100644 index 0000000000..e28f329926 --- /dev/null +++ b/sprites/spr_tartaros_right_arm_shadows/spr_tartaros_right_arm_shadows.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_right_arm_shadows", + "bboxMode":0, + "bbox_bottom":169, + "bbox_left":6, + "bbox_right":51, + "bbox_top":89, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"c87e73e1-e866-4b39-8a1f-96167acb2eca","blendMode":0,"displayName":"default","isLocked":false,"name":"c87e73e1-e866-4b39-8a1f-96167acb2eca","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_right_arm_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_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_tartaros_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":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","path":"sprites/spr_tartaros_right_arm_shadows/spr_tartaros_right_arm_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f9665fe9-f2cc-4a6a-9121-57006f1160f8","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, + "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_right_leg/b53b7c9e-26af-4c4b-9b89-a15af4f7296c.png b/sprites/spr_tartaros_right_leg/b53b7c9e-26af-4c4b-9b89-a15af4f7296c.png deleted file mode 100644 index c23a379154..0000000000 Binary files a/sprites/spr_tartaros_right_leg/b53b7c9e-26af-4c4b-9b89-a15af4f7296c.png and /dev/null differ diff --git a/sprites/spr_tartaros_right_leg/layers/b53b7c9e-26af-4c4b-9b89-a15af4f7296c/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_right_leg/layers/b53b7c9e-26af-4c4b-9b89-a15af4f7296c/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png deleted file mode 100644 index 071c3a5480..0000000000 Binary files a/sprites/spr_tartaros_right_leg/layers/b53b7c9e-26af-4c4b-9b89-a15af4f7296c/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png and /dev/null 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 7715afa3be..060d50ec34 100644 --- a/sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy +++ b/sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy @@ -16,7 +16,6 @@ {"$GMSpriteFrame":"v1","%Name":"b89831c0-4b54-41e5-ad80-4d838fe31550","name":"b89831c0-4b54-41e5-ad80-4d838fe31550","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"392ae0b5-e73f-4011-a77c-8cf14df79212","name":"392ae0b5-e73f-4011-a77c-8cf14df79212","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"f31258fb-8e42-40fa-9abe-d50ce4077249","name":"f31258fb-8e42-40fa-9abe-d50ce4077249","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -53,7 +52,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":5.0, + "length":4.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -67,16 +66,25 @@ "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_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33b4a69d-c4a8-4d97-b35c-86e75a42672f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b89831c0-4b54-41e5-ad80-4d838fe31550","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4aa238e1-d30d-41d0-8a60-6f15dbe70cd1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"392ae0b5-e73f-4011-a77c-8cf14df79212","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93472bf0-431a-46f8-ad3c-040210e0bd9e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f31258fb-8e42-40fa-9abe-d50ce4077249","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b458f2e1-0c00-407a-bf09-7a64ef6bf3e0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b8fc32b-fe8a-41b2-8970-72f6bd2a6892","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_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"33b4a69d-c4a8-4d97-b35c-86e75a42672f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b89831c0-4b54-41e5-ad80-4d838fe31550","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4aa238e1-d30d-41d0-8a60-6f15dbe70cd1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"392ae0b5-e73f-4011-a77c-8cf14df79212","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"93472bf0-431a-46f8-ad3c-040210e0bd9e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f31258fb-8e42-40fa-9abe-d50ce4077249","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b458f2e1-0c00-407a-bf09-7a64ef6bf3e0","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_tartaros_right_leg_shadows/8d99f92f-4aac-47e4-a142-c6ea6be47856.png b/sprites/spr_tartaros_right_leg_shadows/8d99f92f-4aac-47e4-a142-c6ea6be47856.png new file mode 100644 index 0000000000..1baa5ab169 Binary files /dev/null and b/sprites/spr_tartaros_right_leg_shadows/8d99f92f-4aac-47e4-a142-c6ea6be47856.png differ diff --git a/sprites/spr_tartaros_right_leg_shadows/efcff506-8258-4e7c-89aa-82cc9816fb9f.png b/sprites/spr_tartaros_right_leg_shadows/efcff506-8258-4e7c-89aa-82cc9816fb9f.png new file mode 100644 index 0000000000..55aba861e9 Binary files /dev/null and b/sprites/spr_tartaros_right_leg_shadows/efcff506-8258-4e7c-89aa-82cc9816fb9f.png differ diff --git a/sprites/spr_tartaros_right_leg_shadows/f31258fb-8e42-40fa-9abe-d50ce4077249.png b/sprites/spr_tartaros_right_leg_shadows/f31258fb-8e42-40fa-9abe-d50ce4077249.png new file mode 100644 index 0000000000..d42fffccb3 Binary files /dev/null and b/sprites/spr_tartaros_right_leg_shadows/f31258fb-8e42-40fa-9abe-d50ce4077249.png differ diff --git a/sprites/spr_tartaros_right_leg_shadows/fa086401-4b32-4bee-a3f9-fb5ec4f5bfa2.png b/sprites/spr_tartaros_right_leg_shadows/fa086401-4b32-4bee-a3f9-fb5ec4f5bfa2.png new file mode 100644 index 0000000000..55aba861e9 Binary files /dev/null and b/sprites/spr_tartaros_right_leg_shadows/fa086401-4b32-4bee-a3f9-fb5ec4f5bfa2.png differ diff --git a/sprites/spr_tartaros_right_leg_shadows/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_right_leg_shadows/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png new file mode 100644 index 0000000000..4fa94f6b44 Binary files /dev/null and b/sprites/spr_tartaros_right_leg_shadows/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png differ diff --git a/sprites/spr_tartaros_right_leg_shadows/layers/efcff506-8258-4e7c-89aa-82cc9816fb9f/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_right_leg_shadows/layers/efcff506-8258-4e7c-89aa-82cc9816fb9f/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png new file mode 100644 index 0000000000..55aba861e9 Binary files /dev/null and b/sprites/spr_tartaros_right_leg_shadows/layers/efcff506-8258-4e7c-89aa-82cc9816fb9f/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png differ diff --git a/sprites/spr_tartaros_right_leg_shadows/layers/f31258fb-8e42-40fa-9abe-d50ce4077249/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_right_leg_shadows/layers/f31258fb-8e42-40fa-9abe-d50ce4077249/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png new file mode 100644 index 0000000000..d42fffccb3 Binary files /dev/null and b/sprites/spr_tartaros_right_leg_shadows/layers/f31258fb-8e42-40fa-9abe-d50ce4077249/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png differ diff --git a/sprites/spr_tartaros_right_leg_shadows/layers/fa086401-4b32-4bee-a3f9-fb5ec4f5bfa2/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_right_leg_shadows/layers/fa086401-4b32-4bee-a3f9-fb5ec4f5bfa2/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png new file mode 100644 index 0000000000..55aba861e9 Binary files /dev/null and b/sprites/spr_tartaros_right_leg_shadows/layers/fa086401-4b32-4bee-a3f9-fb5ec4f5bfa2/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png differ 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 new file mode 100644 index 0000000000..19b470aa43 --- /dev/null +++ b/sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy @@ -0,0 +1,104 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_right_leg_shadows", + "bboxMode":0, + "bbox_bottom":259, + "bbox_left":16, + "bbox_right":73, + "bbox_top":168, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"efcff506-8258-4e7c-89aa-82cc9816fb9f","name":"efcff506-8258-4e7c-89aa-82cc9816fb9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fa086401-4b32-4bee-a3f9-fb5ec4f5bfa2","name":"fa086401-4b32-4bee-a3f9-fb5ec4f5bfa2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f31258fb-8e42-40fa-9abe-d50ce4077249","name":"f31258fb-8e42-40fa-9abe-d50ce4077249","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"b1ad68ac-732f-42d2-971e-e7f6a4962e33","blendMode":0,"displayName":"default","isLocked":false,"name":"b1ad68ac-732f-42d2-971e-e7f6a4962e33","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_right_leg_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_leg_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":4.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tartaros_right_leg_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":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"33b4a69d-c4a8-4d97-b35c-86e75a42672f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"efcff506-8258-4e7c-89aa-82cc9816fb9f","path":"sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b593ab0b-6afe-418f-9f61-ed3d66804bc1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa086401-4b32-4bee-a3f9-fb5ec4f5bfa2","path":"sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bde8a6fe-7fdf-41ed-99f6-c421cef407dc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f31258fb-8e42-40fa-9abe-d50ce4077249","path":"sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b458f2e1-0c00-407a-bf09-7a64ef6bf3e0","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, + "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