diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 9190e9d697..cb020f0054 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1836,8 +1836,9 @@ {"id":{"name":"spr_weapon_stalker","path":"sprites/spr_weapon_stalker/spr_weapon_stalker.yy",},}, {"id":{"name":"spr_weapon_standard","path":"sprites/spr_weapon_standard/spr_weapon_standard.yy",},}, {"id":{"name":"spr_weapon_standard2","path":"sprites/spr_weapon_standard2/spr_weapon_standard2.yy",},}, - {"id":{"name":"spr_weapon_storm_tall_2","path":"sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy",},}, - {"id":{"name":"spr_weapon_storm_tall","path":"sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy",},}, + {"id":{"name":"spr_weapon_storm_boss","path":"sprites/spr_weapon_storm_boss/spr_weapon_storm_boss.yy",},}, + {"id":{"name":"spr_weapon_storm_complex","path":"sprites/spr_weapon_storm_complex/spr_weapon_storm_complex.yy",},}, + {"id":{"name":"spr_weapon_storm_primary_decoration","path":"sprites/spr_weapon_storm_primary_decoration/spr_weapon_storm_primary_decoration.yy",},}, {"id":{"name":"spr_weapon_storm","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},}, {"id":{"name":"spr_weapon_storm2","path":"sprites/spr_weapon_storm2/spr_weapon_storm2.yy",},}, {"id":{"name":"spr_weapon_sword_oriental","path":"sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy",},}, diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index 13c02a9b3e..4ec5609e61 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -908,7 +908,7 @@ function ComplexSet(_unit) constructor { // // Draw weapons - if (!weapon_right.new_weapon_draw) { + if (!weapon_right.single_left_right_profile) { if ((weapon_right.sprite != 0) && sprite_exists(weapon_right.sprite)) { if ((weapon_right.ui_twoh == false && weapon_left.ui_twoh == false) || weapon_right.ui_twoh == true) { draw_weapon(weapon_right, "right_weapon", 0); @@ -920,7 +920,7 @@ function ComplexSet(_unit) constructor { } } - if (!weapon_left.new_weapon_draw) { + if (!weapon_left.single_left_right_profile) { if ((weapon_left.sprite != 0) && sprite_exists(weapon_left.sprite) && (weapon_right.ui_twoh == false)) { draw_weapon(weapon_left, "left_weapon", 1); } @@ -991,7 +991,7 @@ function ComplexSet(_unit) constructor { }, "melee_twohand": { ui_spec: true, - new_weapon_draw: true, + single_left_right_profile: true, hand_type: 2, hand_on_top: true, }, @@ -1046,7 +1046,7 @@ function ComplexSet(_unit) constructor { "hand_type", "arm_type", "ui_weapon", - "new_weapon_draw", + "single_left_right_profile", "ui_twoh", "ui_spec", "sprite", @@ -1060,7 +1060,7 @@ function ComplexSet(_unit) constructor { if (armour_type == eARMOUR_TYPE.TERMINATOR && !array_contains(["terminator_ranged", "terminator_melee", "terminator_fist"], _arm.display_type)) { _arm.ui_ymod -= 20; if (_arm.display_type == "normal_ranged") { - if (_arm.new_weapon_draw) { + if (_arm.single_left_right_profile) { _arm.ui_xmod += 24; } else { _arm.ui_xmod -= 24; diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 899bf4f3ae..dd85b604ae 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -2259,7 +2259,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2272,7 +2272,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2285,7 +2285,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "ranged_twohand", - new_weapon_draw: true, + single_left_right_profile: true, }, body_types: [ 0, @@ -2326,7 +2326,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2339,7 +2339,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2353,7 +2353,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2366,7 +2366,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "ranged_twohand", - new_weapon_draw: true, + single_left_right_profile: true, }, body_types: [ 0, @@ -2383,7 +2383,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2397,7 +2397,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2410,7 +2410,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2423,7 +2423,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "ranged_twohand", - new_weapon_draw: true, + single_left_right_profile: true, }, body_types: [ 0, @@ -2441,7 +2441,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "ranged_twohand", - new_weapon_draw: true, + single_left_right_profile: true, }, body_types: [ 0, @@ -2458,7 +2458,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2472,7 +2472,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2487,7 +2487,7 @@ global.weapon_visual_data = { weapon_data: { display_type: "melee_onehand", hand_type: 2, - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2501,7 +2501,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "ranged_twohand", - new_weapon_draw: true, + single_left_right_profile: true, }, body_types: [ 0, @@ -2519,7 +2519,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "ranged_twohand", - new_weapon_draw: true, + single_left_right_profile: true, }, body_types: [ 0, @@ -2550,7 +2550,7 @@ global.weapon_visual_data = { sprite: spr_weapon_assca, body_types: [3], armours: ["Dreadnought"], - new_weapon_draw: true, + single_left_right_profile: true, } ], }, @@ -2596,7 +2596,7 @@ global.weapon_visual_data = { sprite: spr_dread_lascannon, body_types: [3], armours: ["Dreadnought"], - new_weapon_draw: true, + single_left_right_profile: true, } ], }, @@ -2607,7 +2607,7 @@ global.weapon_visual_data = { display_type: "dreadnought", }, armours: ["Dreadnought"], - new_weapon_draw: true, + single_left_right_profile: true, }, variants: [ { @@ -2702,7 +2702,7 @@ global.weapon_visual_data = { sprite: spr_dread_plasma_cannon, body_types: [3], armours: ["Dreadnought"], - new_weapon_draw: true, + single_left_right_profile: true, } ], }, @@ -2775,7 +2775,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2788,7 +2788,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2801,7 +2801,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2814,7 +2814,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2827,7 +2827,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2840,7 +2840,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2853,7 +2853,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2866,7 +2866,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2879,7 +2879,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2892,7 +2892,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2905,7 +2905,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2918,7 +2918,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2931,7 +2931,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2944,7 +2944,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2957,7 +2957,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2970,7 +2970,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2983,7 +2983,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -2994,7 +2994,7 @@ global.weapon_visual_data = { sprite: spr_dread_missile, body_types: [3], armours: ["Dreadnought"], - new_weapon_draw: true, + single_left_right_profile: true, } ], }, @@ -3023,7 +3023,7 @@ global.weapon_visual_data = { sprite: spr_dread_plasma_cannon, body_types: [3], armours: ["Dreadnought"], - new_weapon_draw: true, + single_left_right_profile: true, } ], }, @@ -3128,7 +3128,7 @@ global.weapon_visual_data = { weapon_data: { display_type: "melee_onehand", hand_type: 2, - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -3197,7 +3197,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "melee_twohand", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -3210,7 +3210,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "melee_twohand", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -3221,7 +3221,7 @@ global.weapon_visual_data = { sprite: spr_dread_autocannon, body_types: [3], armours: ["Dreadnought"], - new_weapon_draw: true, + single_left_right_profile: true, } ], }, @@ -3233,14 +3233,32 @@ global.weapon_visual_data = { }, variants: [ { - cultures: ["Knightly"], sprite: spr_weapon_storm, + weapon_data : { + single_left_right_profile: true, + }, + subcomponents: [ + [ + spr_blank, + spr_weapon_storm_boss + ], + ] }, { - sprite: spr_weapon_storm_tall, - }, - { - sprite: spr_weapon_storm_tall_2, + sprite: spr_weapon_storm_complex, + weapon_data : { + single_left_right_profile: true, + }, + subcomponents: [ + [ + spr_blank, + spr_weapon_storm_primary_decoration + ], + [ + spr_blank, + spr_weapon_storm_boss + ], + ], }, { sprite: spr_weapon_storm2, @@ -3305,7 +3323,7 @@ global.weapon_visual_data = { weapon_data: { display_type: "melee_onehand", hand_type: 2, - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -3319,7 +3337,7 @@ global.weapon_visual_data = { weapon_data: { display_type: "melee_onehand", hand_type: 2, - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -3333,7 +3351,7 @@ global.weapon_visual_data = { weapon_data: { display_type: "melee_onehand", hand_type: 2, - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -3369,7 +3387,7 @@ global.weapon_visual_data = { weapon_data: { display_type: "melee_onehand", hand_type: 0, - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -3396,7 +3414,7 @@ global.weapon_visual_data = { weapon_data: { display_type: "melee_onehand", hand_type: 2, - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -3424,7 +3442,7 @@ global.weapon_visual_data = { display_type: "melee_onehand", hand_type: 3, arm_type: 3, - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -3439,7 +3457,7 @@ global.weapon_visual_data = { display_type: "melee_onehand", hand_type: 3, arm_type: 3, - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -3454,7 +3472,7 @@ global.weapon_visual_data = { display_type: "melee_onehand", hand_type: 3, arm_type: 3, - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -3484,7 +3502,7 @@ global.weapon_visual_data = { display_type: "melee_onehand", hand_type: 3, arm_type: 3, - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -3498,7 +3516,7 @@ global.weapon_visual_data = { weapon_data: { display_type: "melee_onehand", hand_type: 2, - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -3512,7 +3530,7 @@ global.weapon_visual_data = { weapon_data: { display_type: "melee_onehand", hand_type: 2, - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -3527,7 +3545,7 @@ global.weapon_visual_data = { display_type: "melee_onehand", hand_type: 3, arm_type: 3, - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -3555,7 +3573,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -3568,7 +3586,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "normal_ranged", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -3583,7 +3601,7 @@ global.weapon_visual_data = { display_type: "melee_onehand", hand_type: 3, arm_type: 3, - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ @@ -3596,7 +3614,7 @@ global.weapon_visual_data = { base: { weapon_data: { display_type: "melee_twohand", - new_weapon_draw: true, + single_left_right_profile: true, }, }, variants: [ diff --git a/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml b/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml index f521fd573a..223e0f102a 100644 --- a/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml +++ b/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml @@ -22,7 +22,7 @@ function scr_ui_display_weapons(left_or_right, current_armor, equiped_weapon, cu ui_weapon[left_or_right] = sprite; arm_variant[left_or_right] = 1; ui_spec[left_or_right] = false; - new_weapon_draw[left_or_right] = true; + single_left_right_profile[left_or_right] = true; display_type = "normal_ranged"; }; @@ -50,7 +50,7 @@ function scr_ui_display_weapons(left_or_right, current_armor, equiped_weapon, cu arm_variant[left_or_right] = 0; hand_variant[left_or_right] = 0; ui_spec[left_or_right] = true; - new_weapon_draw[left_or_right] = true; + single_left_right_profile[left_or_right] = true; display_type = "special_ranged"; }; diff --git a/sprites/spr_weapon_storm/daea238a-4d48-48a6-be27-b0685c438110.png b/sprites/spr_weapon_storm/daea238a-4d48-48a6-be27-b0685c438110.png index 41f9addd4c..b5d5640c38 100644 Binary files a/sprites/spr_weapon_storm/daea238a-4d48-48a6-be27-b0685c438110.png and b/sprites/spr_weapon_storm/daea238a-4d48-48a6-be27-b0685c438110.png differ diff --git a/sprites/spr_weapon_storm/ee465ab4-6f68-4a2c-9730-d75939fe4cdb.png b/sprites/spr_weapon_storm/ee465ab4-6f68-4a2c-9730-d75939fe4cdb.png deleted file mode 100644 index 23deac4e47..0000000000 Binary files a/sprites/spr_weapon_storm/ee465ab4-6f68-4a2c-9730-d75939fe4cdb.png and /dev/null differ diff --git a/sprites/spr_weapon_storm/layers/daea238a-4d48-48a6-be27-b0685c438110/a804a20d-f1cf-466a-afcf-3914005ace51.png b/sprites/spr_weapon_storm/layers/daea238a-4d48-48a6-be27-b0685c438110/a804a20d-f1cf-466a-afcf-3914005ace51.png index 41f9addd4c..b5d5640c38 100644 Binary files a/sprites/spr_weapon_storm/layers/daea238a-4d48-48a6-be27-b0685c438110/a804a20d-f1cf-466a-afcf-3914005ace51.png and b/sprites/spr_weapon_storm/layers/daea238a-4d48-48a6-be27-b0685c438110/a804a20d-f1cf-466a-afcf-3914005ace51.png differ diff --git a/sprites/spr_weapon_storm/layers/ee465ab4-6f68-4a2c-9730-d75939fe4cdb/a804a20d-f1cf-466a-afcf-3914005ace51.png b/sprites/spr_weapon_storm/layers/ee465ab4-6f68-4a2c-9730-d75939fe4cdb/a804a20d-f1cf-466a-afcf-3914005ace51.png deleted file mode 100644 index 23deac4e47..0000000000 Binary files a/sprites/spr_weapon_storm/layers/ee465ab4-6f68-4a2c-9730-d75939fe4cdb/a804a20d-f1cf-466a-afcf-3914005ace51.png and /dev/null differ diff --git a/sprites/spr_weapon_storm/spr_weapon_storm.yy b/sprites/spr_weapon_storm/spr_weapon_storm.yy index fd92cfb168..d5b152f033 100644 --- a/sprites/spr_weapon_storm/spr_weapon_storm.yy +++ b/sprites/spr_weapon_storm/spr_weapon_storm.yy @@ -2,10 +2,10 @@ "$GMSprite":"v2", "%Name":"spr_weapon_storm", "bboxMode":0, - "bbox_bottom":178, - "bbox_left":2, - "bbox_right":184, - "bbox_top":54, + "bbox_bottom":186, + "bbox_left":5, + "bbox_right":93, + "bbox_top":62, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, @@ -13,7 +13,6 @@ "For3D":false, "frames":[ {"$GMSpriteFrame":"v1","%Name":"daea238a-4d48-48a6-be27-b0685c438110","name":"daea238a-4d48-48a6-be27-b0685c438110","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -50,7 +49,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":2.0, + "length":1.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -69,8 +68,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"daea238a-4d48-48a6-be27-b0685c438110","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee3e6256-19ea-4071-91e7-fdc1b74bcdff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c0636cd-15ad-4c13-934c-2259a4748348","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"daea238a-4d48-48a6-be27-b0685c438110","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ee3e6256-19ea-4071-91e7-fdc1b74bcdff","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_storm_boss/01cfc084-6c18-454c-9537-b663aca39099.png b/sprites/spr_weapon_storm_boss/01cfc084-6c18-454c-9537-b663aca39099.png new file mode 100644 index 0000000000..d6def07e0d Binary files /dev/null and b/sprites/spr_weapon_storm_boss/01cfc084-6c18-454c-9537-b663aca39099.png differ diff --git a/sprites/spr_weapon_storm_boss/a0ddaddb-fc24-4a60-b1d5-879df96f8d55.png b/sprites/spr_weapon_storm_boss/a0ddaddb-fc24-4a60-b1d5-879df96f8d55.png new file mode 100644 index 0000000000..90c863b83f Binary files /dev/null and b/sprites/spr_weapon_storm_boss/a0ddaddb-fc24-4a60-b1d5-879df96f8d55.png differ diff --git a/sprites/spr_weapon_storm_boss/layers/01cfc084-6c18-454c-9537-b663aca39099/de5767ae-6d22-475e-9c6e-ff70653933ba.png b/sprites/spr_weapon_storm_boss/layers/01cfc084-6c18-454c-9537-b663aca39099/de5767ae-6d22-475e-9c6e-ff70653933ba.png new file mode 100644 index 0000000000..d6def07e0d Binary files /dev/null and b/sprites/spr_weapon_storm_boss/layers/01cfc084-6c18-454c-9537-b663aca39099/de5767ae-6d22-475e-9c6e-ff70653933ba.png differ diff --git a/sprites/spr_weapon_storm_boss/layers/a0ddaddb-fc24-4a60-b1d5-879df96f8d55/de5767ae-6d22-475e-9c6e-ff70653933ba.png b/sprites/spr_weapon_storm_boss/layers/a0ddaddb-fc24-4a60-b1d5-879df96f8d55/de5767ae-6d22-475e-9c6e-ff70653933ba.png new file mode 100644 index 0000000000..90c863b83f Binary files /dev/null and b/sprites/spr_weapon_storm_boss/layers/a0ddaddb-fc24-4a60-b1d5-879df96f8d55/de5767ae-6d22-475e-9c6e-ff70653933ba.png differ diff --git a/sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy b/sprites/spr_weapon_storm_boss/spr_weapon_storm_boss.yy similarity index 58% rename from sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy rename to sprites/spr_weapon_storm_boss/spr_weapon_storm_boss.yy index 95d9666d6c..1437764a78 100644 --- a/sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy +++ b/sprites/spr_weapon_storm_boss/spr_weapon_storm_boss.yy @@ -1,28 +1,28 @@ { "$GMSprite":"v2", - "%Name":"spr_weapon_storm_tall_2", + "%Name":"spr_weapon_storm_boss", "bboxMode":0, - "bbox_bottom":231, - "bbox_left":0, - "bbox_right":186, - "bbox_top":70, + "bbox_bottom":157, + "bbox_left":23, + "bbox_right":75, + "bbox_top":81, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"v1","%Name":"05d4f358-c637-4959-b4f8-043dddfe5af9","name":"05d4f358-c637-4959-b4f8-043dddfe5af9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"0ae042dd-6007-483e-a319-a21e64ff24ac","name":"0ae042dd-6007-483e-a319-a21e64ff24ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a0ddaddb-fc24-4a60-b1d5-879df96f8d55","name":"a0ddaddb-fc24-4a60-b1d5-879df96f8d55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01cfc084-6c18-454c-9537-b663aca39099","name":"01cfc084-6c18-454c-9537-b663aca39099","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":232, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"f2647c24-3f93-47a4-8331-ab08121dcc0b","blendMode":0,"displayName":"default","isLocked":false,"name":"f2647c24-3f93-47a4-8331-ab08121dcc0b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"de5767ae-6d22-475e-9c6e-ff70653933ba","blendMode":0,"displayName":"default","isLocked":false,"name":"de5767ae-6d22-475e-9c6e-ff70653933ba","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "name":"spr_weapon_storm_tall_2", + "name":"spr_weapon_storm_boss", "nineSlice":null, "origin":9, "parent":{ @@ -34,7 +34,7 @@ "resourceVersion":"2.0", "sequence":{ "$GMSequence":"v1", - "%Name":"spr_weapon_storm_tall_2", + "%Name":"spr_weapon_storm_boss", "autoRecord":true, "backdropHeight":1080, "backdropImageOpacity":0.5, @@ -58,7 +58,7 @@ "resourceType":"KeyframeStore", "resourceVersion":"2.0", }, - "name":"spr_weapon_storm_tall_2", + "name":"spr_weapon_storm_boss", "playback":1, "playbackSpeed":1.0, "playbackSpeedType":1, @@ -71,8 +71,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05d4f358-c637-4959-b4f8-043dddfe5af9","path":"sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08ecee5b-0d7d-4070-b8ec-270dfd0e535c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ae042dd-6007-483e-a319-a21e64ff24ac","path":"sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82b4df8c-0dbd-4454-99f2-0cd556e14669","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a0ddaddb-fc24-4a60-b1d5-879df96f8d55","path":"sprites/spr_weapon_storm_boss/spr_weapon_storm_boss.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5cdeab62-4be5-4a9d-b69a-c822b1d457ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01cfc084-6c18-454c-9537-b663aca39099","path":"sprites/spr_weapon_storm_boss/spr_weapon_storm_boss.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"79d71c8d-60eb-4fa4-aa30-32f55c4c1b02","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, diff --git a/sprites/spr_weapon_storm_complex/5b5c1623-f3d9-454f-b7dd-b5829627bcb9.png b/sprites/spr_weapon_storm_complex/5b5c1623-f3d9-454f-b7dd-b5829627bcb9.png new file mode 100644 index 0000000000..9a7dd9a15f Binary files /dev/null and b/sprites/spr_weapon_storm_complex/5b5c1623-f3d9-454f-b7dd-b5829627bcb9.png differ diff --git a/sprites/spr_weapon_storm_complex/f6262674-c261-4da7-aa0e-506e3196aa81.png b/sprites/spr_weapon_storm_complex/f6262674-c261-4da7-aa0e-506e3196aa81.png new file mode 100644 index 0000000000..1048706461 Binary files /dev/null and b/sprites/spr_weapon_storm_complex/f6262674-c261-4da7-aa0e-506e3196aa81.png differ diff --git a/sprites/spr_weapon_storm_complex/layers/5b5c1623-f3d9-454f-b7dd-b5829627bcb9/de5767ae-6d22-475e-9c6e-ff70653933ba.png b/sprites/spr_weapon_storm_complex/layers/5b5c1623-f3d9-454f-b7dd-b5829627bcb9/de5767ae-6d22-475e-9c6e-ff70653933ba.png new file mode 100644 index 0000000000..9a7dd9a15f Binary files /dev/null and b/sprites/spr_weapon_storm_complex/layers/5b5c1623-f3d9-454f-b7dd-b5829627bcb9/de5767ae-6d22-475e-9c6e-ff70653933ba.png differ diff --git a/sprites/spr_weapon_storm_complex/layers/f6262674-c261-4da7-aa0e-506e3196aa81/de5767ae-6d22-475e-9c6e-ff70653933ba.png b/sprites/spr_weapon_storm_complex/layers/f6262674-c261-4da7-aa0e-506e3196aa81/de5767ae-6d22-475e-9c6e-ff70653933ba.png new file mode 100644 index 0000000000..1048706461 Binary files /dev/null and b/sprites/spr_weapon_storm_complex/layers/f6262674-c261-4da7-aa0e-506e3196aa81/de5767ae-6d22-475e-9c6e-ff70653933ba.png differ diff --git a/sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy b/sprites/spr_weapon_storm_complex/spr_weapon_storm_complex.yy similarity index 67% rename from sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy rename to sprites/spr_weapon_storm_complex/spr_weapon_storm_complex.yy index f26aeeaf43..bda3a03e1c 100644 --- a/sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy +++ b/sprites/spr_weapon_storm_complex/spr_weapon_storm_complex.yy @@ -1,10 +1,10 @@ { "$GMSprite":"v2", - "%Name":"spr_weapon_storm_tall", + "%Name":"spr_weapon_storm_complex", "bboxMode":0, "bbox_bottom":221, "bbox_left":0, - "bbox_right":186, + "bbox_right":98, "bbox_top":60, "collisionKind":1, "collisionTolerance":0, @@ -13,7 +13,7 @@ "For3D":false, "frames":[ {"$GMSpriteFrame":"v1","%Name":"f6262674-c261-4da7-aa0e-506e3196aa81","name":"f6262674-c261-4da7-aa0e-506e3196aa81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5b5c1623-f3d9-454f-b7dd-b5829627bcb9","name":"5b5c1623-f3d9-454f-b7dd-b5829627bcb9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -22,7 +22,7 @@ "layers":[ {"$GMImageLayer":"","%Name":"de5767ae-6d22-475e-9c6e-ff70653933ba","blendMode":0,"displayName":"default","isLocked":false,"name":"de5767ae-6d22-475e-9c6e-ff70653933ba","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "name":"spr_weapon_storm_tall", + "name":"spr_weapon_storm_complex", "nineSlice":null, "origin":9, "parent":{ @@ -34,7 +34,7 @@ "resourceVersion":"2.0", "sequence":{ "$GMSequence":"v1", - "%Name":"spr_weapon_storm_tall", + "%Name":"spr_weapon_storm_complex", "autoRecord":true, "backdropHeight":1080, "backdropImageOpacity":0.5, @@ -58,7 +58,7 @@ "resourceType":"KeyframeStore", "resourceVersion":"2.0", }, - "name":"spr_weapon_storm_tall", + "name":"spr_weapon_storm_complex", "playback":1, "playbackSpeed":1.0, "playbackSpeedType":1, @@ -71,8 +71,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6262674-c261-4da7-aa0e-506e3196aa81","path":"sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2995137d-6005-4690-8d87-3db7ccdd4a8f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","path":"sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d37d0b5a-f4ff-4e58-a47e-444660a0acf0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6262674-c261-4da7-aa0e-506e3196aa81","path":"sprites/spr_weapon_storm_complex/spr_weapon_storm_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2995137d-6005-4690-8d87-3db7ccdd4a8f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b5c1623-f3d9-454f-b7dd-b5829627bcb9","path":"sprites/spr_weapon_storm_complex/spr_weapon_storm_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2674ee0b-05d2-4bcf-a475-1eeaa96bfcec","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, diff --git a/sprites/spr_weapon_storm_primary_decoration/5b5c1623-f3d9-454f-b7dd-b5829627bcb9.png b/sprites/spr_weapon_storm_primary_decoration/5b5c1623-f3d9-454f-b7dd-b5829627bcb9.png new file mode 100644 index 0000000000..72fff2c810 Binary files /dev/null and b/sprites/spr_weapon_storm_primary_decoration/5b5c1623-f3d9-454f-b7dd-b5829627bcb9.png differ diff --git a/sprites/spr_weapon_storm_primary_decoration/f6262674-c261-4da7-aa0e-506e3196aa81.png b/sprites/spr_weapon_storm_primary_decoration/f6262674-c261-4da7-aa0e-506e3196aa81.png new file mode 100644 index 0000000000..ecd23c71ea Binary files /dev/null and b/sprites/spr_weapon_storm_primary_decoration/f6262674-c261-4da7-aa0e-506e3196aa81.png differ diff --git a/sprites/spr_weapon_storm_primary_decoration/layers/5b5c1623-f3d9-454f-b7dd-b5829627bcb9/de5767ae-6d22-475e-9c6e-ff70653933ba.png b/sprites/spr_weapon_storm_primary_decoration/layers/5b5c1623-f3d9-454f-b7dd-b5829627bcb9/de5767ae-6d22-475e-9c6e-ff70653933ba.png new file mode 100644 index 0000000000..72fff2c810 Binary files /dev/null and b/sprites/spr_weapon_storm_primary_decoration/layers/5b5c1623-f3d9-454f-b7dd-b5829627bcb9/de5767ae-6d22-475e-9c6e-ff70653933ba.png differ diff --git a/sprites/spr_weapon_storm_primary_decoration/layers/f6262674-c261-4da7-aa0e-506e3196aa81/de5767ae-6d22-475e-9c6e-ff70653933ba.png b/sprites/spr_weapon_storm_primary_decoration/layers/f6262674-c261-4da7-aa0e-506e3196aa81/de5767ae-6d22-475e-9c6e-ff70653933ba.png new file mode 100644 index 0000000000..ecd23c71ea Binary files /dev/null and b/sprites/spr_weapon_storm_primary_decoration/layers/f6262674-c261-4da7-aa0e-506e3196aa81/de5767ae-6d22-475e-9c6e-ff70653933ba.png differ diff --git a/sprites/spr_weapon_storm_primary_decoration/spr_weapon_storm_primary_decoration.yy b/sprites/spr_weapon_storm_primary_decoration/spr_weapon_storm_primary_decoration.yy new file mode 100644 index 0000000000..6ad9c7edcd --- /dev/null +++ b/sprites/spr_weapon_storm_primary_decoration/spr_weapon_storm_primary_decoration.yy @@ -0,0 +1,96 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_storm_primary_decoration", + "bboxMode":0, + "bbox_bottom":210, + "bbox_left":5, + "bbox_right":93, + "bbox_top":62, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"f6262674-c261-4da7-aa0e-506e3196aa81","name":"f6262674-c261-4da7-aa0e-506e3196aa81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5b5c1623-f3d9-454f-b7dd-b5829627bcb9","name":"5b5c1623-f3d9-454f-b7dd-b5829627bcb9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"de5767ae-6d22-475e-9c6e-ff70653933ba","blendMode":0,"displayName":"default","isLocked":false,"name":"de5767ae-6d22-475e-9c6e-ff70653933ba","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_storm_primary_decoration", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"weapons", + "path":"folders/Sprites/Marine Viewer/weapons.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_storm_primary_decoration", + "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_storm_primary_decoration", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":187.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":"f6262674-c261-4da7-aa0e-506e3196aa81","path":"sprites/spr_weapon_storm_primary_decoration/spr_weapon_storm_primary_decoration.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2995137d-6005-4690-8d87-3db7ccdd4a8f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b5c1623-f3d9-454f-b7dd-b5829627bcb9","path":"sprites/spr_weapon_storm_primary_decoration/spr_weapon_storm_primary_decoration.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2674ee0b-05d2-4bcf-a475-1eeaa96bfcec","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":10, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":187, +} \ No newline at end of file diff --git a/sprites/spr_weapon_storm_tall/c0e369b0-ce8e-42eb-8a69-e7058b47bcff.png b/sprites/spr_weapon_storm_tall/c0e369b0-ce8e-42eb-8a69-e7058b47bcff.png deleted file mode 100644 index 10b0a31eec..0000000000 Binary files a/sprites/spr_weapon_storm_tall/c0e369b0-ce8e-42eb-8a69-e7058b47bcff.png and /dev/null differ diff --git a/sprites/spr_weapon_storm_tall/f6262674-c261-4da7-aa0e-506e3196aa81.png b/sprites/spr_weapon_storm_tall/f6262674-c261-4da7-aa0e-506e3196aa81.png deleted file mode 100644 index aa2cad13f4..0000000000 Binary files a/sprites/spr_weapon_storm_tall/f6262674-c261-4da7-aa0e-506e3196aa81.png and /dev/null differ diff --git a/sprites/spr_weapon_storm_tall/layers/c0e369b0-ce8e-42eb-8a69-e7058b47bcff/de5767ae-6d22-475e-9c6e-ff70653933ba.png b/sprites/spr_weapon_storm_tall/layers/c0e369b0-ce8e-42eb-8a69-e7058b47bcff/de5767ae-6d22-475e-9c6e-ff70653933ba.png deleted file mode 100644 index 10b0a31eec..0000000000 Binary files a/sprites/spr_weapon_storm_tall/layers/c0e369b0-ce8e-42eb-8a69-e7058b47bcff/de5767ae-6d22-475e-9c6e-ff70653933ba.png and /dev/null differ diff --git a/sprites/spr_weapon_storm_tall/layers/f6262674-c261-4da7-aa0e-506e3196aa81/de5767ae-6d22-475e-9c6e-ff70653933ba.png b/sprites/spr_weapon_storm_tall/layers/f6262674-c261-4da7-aa0e-506e3196aa81/de5767ae-6d22-475e-9c6e-ff70653933ba.png deleted file mode 100644 index aa2cad13f4..0000000000 Binary files a/sprites/spr_weapon_storm_tall/layers/f6262674-c261-4da7-aa0e-506e3196aa81/de5767ae-6d22-475e-9c6e-ff70653933ba.png and /dev/null differ diff --git a/sprites/spr_weapon_storm_tall_2/05d4f358-c637-4959-b4f8-043dddfe5af9.png b/sprites/spr_weapon_storm_tall_2/05d4f358-c637-4959-b4f8-043dddfe5af9.png deleted file mode 100644 index 103f07a16d..0000000000 Binary files a/sprites/spr_weapon_storm_tall_2/05d4f358-c637-4959-b4f8-043dddfe5af9.png and /dev/null differ diff --git a/sprites/spr_weapon_storm_tall_2/0ae042dd-6007-483e-a319-a21e64ff24ac.png b/sprites/spr_weapon_storm_tall_2/0ae042dd-6007-483e-a319-a21e64ff24ac.png deleted file mode 100644 index b2d7e7690e..0000000000 Binary files a/sprites/spr_weapon_storm_tall_2/0ae042dd-6007-483e-a319-a21e64ff24ac.png and /dev/null differ diff --git a/sprites/spr_weapon_storm_tall_2/layers/05d4f358-c637-4959-b4f8-043dddfe5af9/f2647c24-3f93-47a4-8331-ab08121dcc0b.png b/sprites/spr_weapon_storm_tall_2/layers/05d4f358-c637-4959-b4f8-043dddfe5af9/f2647c24-3f93-47a4-8331-ab08121dcc0b.png deleted file mode 100644 index 103f07a16d..0000000000 Binary files a/sprites/spr_weapon_storm_tall_2/layers/05d4f358-c637-4959-b4f8-043dddfe5af9/f2647c24-3f93-47a4-8331-ab08121dcc0b.png and /dev/null differ diff --git a/sprites/spr_weapon_storm_tall_2/layers/0ae042dd-6007-483e-a319-a21e64ff24ac/f2647c24-3f93-47a4-8331-ab08121dcc0b.png b/sprites/spr_weapon_storm_tall_2/layers/0ae042dd-6007-483e-a319-a21e64ff24ac/f2647c24-3f93-47a4-8331-ab08121dcc0b.png deleted file mode 100644 index b2d7e7690e..0000000000 Binary files a/sprites/spr_weapon_storm_tall_2/layers/0ae042dd-6007-483e-a319-a21e64ff24ac/f2647c24-3f93-47a4-8331-ab08121dcc0b.png and /dev/null differ