diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index b8e0558769..76d15b730d 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -576,7 +576,7 @@ "isEcma":false, "LibraryEmitters":[], "MetaData":{ - "IDEVersion":"2024.1400.0.892", + "IDEVersion":"2024.1400.0.901", }, "name":"ChapterMaster", "resources":[ @@ -1648,6 +1648,7 @@ {"id":{"name":"spr_tartaros_right_arm","path":"sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.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",},}, {"id":{"name":"spr_tartaros_wep_fix","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},}, {"id":{"name":"spr_tartaros2_colors","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},}, {"id":{"name":"spr_tech_area_pad","path":"sprites/spr_tech_area_pad/spr_tech_area_pad.yy",},}, diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index f036f64a59..6edf1a1ae4 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -1342,7 +1342,6 @@ function ComplexSet(_unit) constructor { break; case "Tartaros": add_group({ - armour: spr_tartaros_complex, left_arm: spr_tartaros_left_arm, right_arm: spr_tartaros_right_arm, right_leg: spr_tartaros_right_leg, diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 54ed91f3c9..5205f6f6da 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -1427,6 +1427,13 @@ global.modular_drawing_items = [ shadows : spr_mk7_right_arm_shadow, body_types : [0], flip : true, + }, + { + position : "armour", + armours : ["Tartaros"], + sprite : spr_tartaros_complex, + shadows : spr_tartaros_shadows, + body_types : [2], } ]; diff --git a/sprites/spr_tartaros_shadows/548e11a0-6b13-4fa6-93be-4121736d914f.png b/sprites/spr_tartaros_shadows/548e11a0-6b13-4fa6-93be-4121736d914f.png new file mode 100644 index 0000000000..1f0e1c8e03 Binary files /dev/null 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 new file mode 100644 index 0000000000..1f0e1c8e03 Binary files /dev/null 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 new file mode 100644 index 0000000000..445ab3a2a6 --- /dev/null +++ b/sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_shadows", + "bboxMode":0, + "bbox_bottom":204, + "bbox_left":10, + "bbox_right":169, + "bbox_top":32, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"548e11a0-6b13-4fa6-93be-4121736d914f","name":"548e11a0-6b13-4fa6-93be-4121736d914f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"229b5182-d233-4896-9f67-630367846af5","blendMode":0,"displayName":"default","isLocked":false,"name":"229b5182-d233-4896-9f67-630367846af5","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_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_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_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":"548e11a0-6b13-4fa6-93be-4121736d914f","path":"sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b2b5bad7-34d4-4dfe-8037-a5bf1df0c661","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