diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index db10ccab14..d950a17fc8 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -99,6 +99,7 @@ map_scale = 1; scale_mod = 1; unit_manage_constants = {}; unit_manage_constants.current_data = [-1,-1]; +management_buttons = false; diplomacy_pathway = ""; diff --git a/objects/obj_controller/Draw_0.gml b/objects/obj_controller/Draw_0.gml index acff72bd7b..98d8d61cd1 100644 --- a/objects/obj_controller/Draw_0.gml +++ b/objects/obj_controller/Draw_0.gml @@ -4,35 +4,31 @@ try{ scr_ui_manage(); } catch(_exception){ handle_exception(_exception); - manage = 0; - menu = 0; - + main_map_defaults(); } + try{ scr_ui_advisors(); } catch(_exception){ handle_exception(_exception); - manage = 0; - menu = 0; + main_map_defaults(); } -try{ - /*if (audience > 0 && instance_exists(obj_turn_end)){ - menu = 20; - }*/ - if (menu == MENU.Diplomacy){ + if (menu == MENU.Diplomacy){ + try{ + /*if (audience > 0 && instance_exists(obj_turn_end)){ + menu = 20; + }*/ + scr_ui_diplomacy(); - } -} catch(_exception){ - handle_exception(_exception); - manage = 0; - menu = 0; -} + } catch(_exception){ + handle_exception(_exception); + main_map_defaults(); + } + } try{ scr_ui_settings(); + scr_ui_popup(); } catch(_exception){ handle_exception(_exception); - manage = 0; - menu = 0; + main_map_defaults(); } - -scr_ui_popup(); \ No newline at end of file diff --git a/objects/obj_event_log/Draw_0.gml b/objects/obj_event_log/Draw_0.gml index 71c55124a3..6b22dfde5b 100644 --- a/objects/obj_event_log/Draw_0.gml +++ b/objects/obj_event_log/Draw_0.gml @@ -43,8 +43,7 @@ if (__b__) { if (point_and_click(draw_unit_buttons([xx + 1400, yy + 120 + (p * 26)], "View", [1, 1], c_green, , fnt_40k_14b, 1,true))) { var view_star = star_by_name(cur_event.event_target); if (view_star != "none") { - obj_controller.menu = 0; - obj_controller.hide_banner = 0; + main_map_defaults(); obj_controller.x = view_star.x; obj_controller.y = view_star.y; } @@ -86,7 +85,7 @@ if (__b__) { draw_sprite(spr_help_exit, 1, xx + 1104, yy + 72); if (scr_click_left()) { with(obj_controller) { - menu = 0; + main_map_defaults(); onceh = 1; click = 1; hide_banner = 0; diff --git a/objects/obj_star_select/Create_0.gml b/objects/obj_star_select/Create_0.gml index 57c3ecea61..6939455b1b 100644 --- a/objects/obj_star_select/Create_0.gml +++ b/objects/obj_star_select/Create_0.gml @@ -14,6 +14,9 @@ tau=0; chaos=0; p_data = new PlanetData(0, target); has_player_forces = array_sum(target.p_player); + +manage_units_button = new UnitButtonObject({x1 :115, y1:200, style : "pixel", label:"Manage Units"}); + torpedo = scr_item_count("Cyclonic Torpedo"); feature= ""; diff --git a/objects/obj_star_select/Draw_64.gml b/objects/obj_star_select/Draw_64.gml index 51fbf34fab..812fed0ae9 100644 --- a/objects/obj_star_select/Draw_64.gml +++ b/objects/obj_star_select/Draw_64.gml @@ -126,8 +126,9 @@ if (global.cheat_debug && obj_controller.selecting_planet && !loading) } } -if (obj_controller.menu == 0) { - if (has_player_forces && point_and_click(draw_unit_buttons([125, 200], "Manage Units",[1,1],c_blue))) { + +if (obj_controller.menu == 0){ + if (manage_units_button.draw(has_player_forces)){ var _viewer = obj_controller.location_viewer _viewer.update_garrison_log(); var _unit_dispersement = _viewer.garrison_log; @@ -142,10 +143,13 @@ if (obj_controller.menu == 0) { planet : 0, selections : [] }); + instance_destroy(); + exit; } } } + if (loading!=0){ draw_set_font(fnt_40k_14); draw_set_color(CM_GREEN_COLOR); diff --git a/scripts/is_specialist/is_specialist.gml b/scripts/is_specialist/is_specialist.gml index 7255973254..eb31837973 100644 --- a/scripts/is_specialist/is_specialist.gml +++ b/scripts/is_specialist/is_specialist.gml @@ -370,12 +370,6 @@ function group_selection(group, selection_data={}) { } else { basic_manage_settings(); } - with(obj_fleet_select) { - instance_destroy(); - } - with(obj_star_select) { - instance_destroy(); - } exit_button = new ShutterButton(); proceed_button = new ShutterButton(); @@ -428,7 +422,7 @@ function group_selection(group, selection_data={}) { managing = -1; } } - obj_controller.menu = MENU.Manage; + show_debug_message($"manage_success {obj_controller.menu}"); } catch (_exception) { //handle and send player back to map handle_exception(_exception); diff --git a/scripts/scr_controller_helpers/scr_controller_helpers.gml b/scripts/scr_controller_helpers/scr_controller_helpers.gml index 31f52864d6..52ab253e31 100644 --- a/scripts/scr_controller_helpers/scr_controller_helpers.gml +++ b/scripts/scr_controller_helpers/scr_controller_helpers.gml @@ -22,9 +22,6 @@ function scr_menu_clear_up(specific_area_function) { } } } - if (instance_exists(obj_star_select)) { - exit; - } if (instance_exists(obj_bomb_select)) { exit; } @@ -100,7 +97,7 @@ function scr_change_menu(wanted_menu, specific_area_function=false) { function main_map_defaults(){ with (obj_controller){ - menu = 0; + menu = MENU.Default; hide_banner = 0; location_viewer.update_garrison_log(); managing = 0; @@ -146,11 +143,18 @@ function scr_in_game_menu() { } function basic_manage_settings() { - menu = MENU.Manage; - popup = 0; - selected = 0; - diplomacy = 0; - allow_shortcuts = true; + with (obj_controller){ + menu = MENU.Manage; + popup = 0; + selected = 0; + diplomacy = 0; + allow_shortcuts = true; + + init_manage_buttons(); + } +} + +function init_manage_buttons(){ management_buttons = { squad_toggle: new UnitButtonObject({ style: "pixel", diff --git a/scripts/scr_ui_manage/scr_ui_manage.gml b/scripts/scr_ui_manage/scr_ui_manage.gml index f88196d7dd..8fcca894ce 100644 --- a/scripts/scr_ui_manage/scr_ui_manage.gml +++ b/scripts/scr_ui_manage/scr_ui_manage.gml @@ -501,6 +501,10 @@ function company_specific_management(){ } function alternative_manage_views(x1, y1) { + //for some reason management_buttons keeps dying so hopefully this will solve the issue until something better can be found + if (!is_struct(management_buttons)){ + init_manage_buttons(); + } var _squad_button = management_buttons.squad_toggle; _squad_button.update({ x1: x1 + 5, diff --git a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml index fe4a6078a5..65f4381a8a 100644 --- a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml +++ b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml @@ -471,7 +471,6 @@ function exit_adhoc_manage(){ if (struct_exists(location_viewer.garrison_log, selection_data.system.name)){ var sys_name = selection_data.system.name; group_selection(location_viewer.garrison_log[$sys_name].units,selection_data); - new_company_struct(); } else { exit_adhoc_manage(); } diff --git a/sprites/mk7_chest_variants/18394c2c-6406-40fe-8ad1-ee4ebd629435.png b/sprites/mk7_chest_variants/18394c2c-6406-40fe-8ad1-ee4ebd629435.png index 9c8bf8478c..3272765d72 100644 Binary files a/sprites/mk7_chest_variants/18394c2c-6406-40fe-8ad1-ee4ebd629435.png and b/sprites/mk7_chest_variants/18394c2c-6406-40fe-8ad1-ee4ebd629435.png differ diff --git a/sprites/mk7_chest_variants/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee.png b/sprites/mk7_chest_variants/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee.png index a3a45e1a76..df653d98c7 100644 Binary files a/sprites/mk7_chest_variants/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee.png and b/sprites/mk7_chest_variants/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee.png differ diff --git a/sprites/mk7_chest_variants/layers/18394c2c-6406-40fe-8ad1-ee4ebd629435/afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png b/sprites/mk7_chest_variants/layers/18394c2c-6406-40fe-8ad1-ee4ebd629435/afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png index 7b5d773b82..3272765d72 100644 Binary files a/sprites/mk7_chest_variants/layers/18394c2c-6406-40fe-8ad1-ee4ebd629435/afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png and b/sprites/mk7_chest_variants/layers/18394c2c-6406-40fe-8ad1-ee4ebd629435/afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png differ diff --git a/sprites/mk7_chest_variants/layers/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee/afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png b/sprites/mk7_chest_variants/layers/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee/afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png index 164eb857ef..df653d98c7 100644 Binary files a/sprites/mk7_chest_variants/layers/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee/afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png and b/sprites/mk7_chest_variants/layers/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee/afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png differ diff --git a/sprites/mk7_chest_variants/mk7_chest_variants.yy b/sprites/mk7_chest_variants/mk7_chest_variants.yy index d690dc273a..62a8ad2811 100644 --- a/sprites/mk7_chest_variants/mk7_chest_variants.yy +++ b/sprites/mk7_chest_variants/mk7_chest_variants.yy @@ -69,8 +69,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"18394c2c-6406-40fe-8ad1-ee4ebd629435","path":"sprites/mk7_chest_variants/mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f9f20b0-beb6-439c-bd82-d2569b74ba6a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","path":"sprites/mk7_chest_variants/mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"deecab9f-9a51-4147-8f41-8240312df64e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"18394c2c-6406-40fe-8ad1-ee4ebd629435","path":"sprites/mk7_chest_variants/mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6f9f20b0-beb6-439c-bd82-d2569b74ba6a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","path":"sprites/mk7_chest_variants/mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"deecab9f-9a51-4147-8f41-8240312df64e","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_da_mk6_helm_crests/dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c.png b/sprites/spr_da_mk6_helm_crests/dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c.png index fbc00612ca..61aad66a92 100644 Binary files a/sprites/spr_da_mk6_helm_crests/dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c.png and b/sprites/spr_da_mk6_helm_crests/dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c.png differ diff --git a/sprites/spr_da_mk6_helm_crests/layers/dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c/89065597-920b-4d9f-8c26-3b28108bf116.png b/sprites/spr_da_mk6_helm_crests/layers/dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c/89065597-920b-4d9f-8c26-3b28108bf116.png index fbc00612ca..61aad66a92 100644 Binary files a/sprites/spr_da_mk6_helm_crests/layers/dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c/89065597-920b-4d9f-8c26-3b28108bf116.png and b/sprites/spr_da_mk6_helm_crests/layers/dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c/89065597-920b-4d9f-8c26-3b28108bf116.png differ diff --git a/sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy b/sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy index f87bef02a6..ecf6433d31 100644 --- a/sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy +++ b/sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy @@ -68,7 +68,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c","path":"sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33ab751e-df92-4816-adb3-fdc6e3711add","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c","path":"sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"33ab751e-df92-4816-adb3-fdc6e3711add","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_fur_tail_topknot/778eed9c-61df-4cb3-b13d-b1945275af2a.png b/sprites/spr_fur_tail_topknot/778eed9c-61df-4cb3-b13d-b1945275af2a.png index f88531158e..ce74a3d422 100644 Binary files a/sprites/spr_fur_tail_topknot/778eed9c-61df-4cb3-b13d-b1945275af2a.png and b/sprites/spr_fur_tail_topknot/778eed9c-61df-4cb3-b13d-b1945275af2a.png differ diff --git a/sprites/spr_fur_tail_topknot/layers/778eed9c-61df-4cb3-b13d-b1945275af2a/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png b/sprites/spr_fur_tail_topknot/layers/778eed9c-61df-4cb3-b13d-b1945275af2a/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png index f88531158e..ce74a3d422 100644 Binary files a/sprites/spr_fur_tail_topknot/layers/778eed9c-61df-4cb3-b13d-b1945275af2a/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png and b/sprites/spr_fur_tail_topknot/layers/778eed9c-61df-4cb3-b13d-b1945275af2a/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png differ diff --git a/sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy b/sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy index f3a4363cb4..bcd01fa808 100644 --- a/sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy +++ b/sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy @@ -68,7 +68,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"778eed9c-61df-4cb3-b13d-b1945275af2a","path":"sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5190dfd2-b856-4886-b584-f0be72285950","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"778eed9c-61df-4cb3-b13d-b1945275af2a","path":"sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5190dfd2-b856-4886-b584-f0be72285950","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_gladiator_crest/ff8c3aa8-dc36-45e8-b043-45038d329396.png b/sprites/spr_gladiator_crest/ff8c3aa8-dc36-45e8-b043-45038d329396.png index 04b591eb74..355d83c379 100644 Binary files a/sprites/spr_gladiator_crest/ff8c3aa8-dc36-45e8-b043-45038d329396.png and b/sprites/spr_gladiator_crest/ff8c3aa8-dc36-45e8-b043-45038d329396.png differ diff --git a/sprites/spr_gladiator_crest/layers/ff8c3aa8-dc36-45e8-b043-45038d329396/020e45fd-27e1-48c7-801f-deacfe57d9c1.png b/sprites/spr_gladiator_crest/layers/ff8c3aa8-dc36-45e8-b043-45038d329396/020e45fd-27e1-48c7-801f-deacfe57d9c1.png index 04b591eb74..355d83c379 100644 Binary files a/sprites/spr_gladiator_crest/layers/ff8c3aa8-dc36-45e8-b043-45038d329396/020e45fd-27e1-48c7-801f-deacfe57d9c1.png and b/sprites/spr_gladiator_crest/layers/ff8c3aa8-dc36-45e8-b043-45038d329396/020e45fd-27e1-48c7-801f-deacfe57d9c1.png differ diff --git a/sprites/spr_gladiator_crest/spr_gladiator_crest.yy b/sprites/spr_gladiator_crest/spr_gladiator_crest.yy index 801c83c38f..4a3aabc9f4 100644 --- a/sprites/spr_gladiator_crest/spr_gladiator_crest.yy +++ b/sprites/spr_gladiator_crest/spr_gladiator_crest.yy @@ -68,7 +68,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff8c3aa8-dc36-45e8-b043-45038d329396","path":"sprites/spr_gladiator_crest/spr_gladiator_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9b14dec7-6f59-49b0-8561-5319c7501f32","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff8c3aa8-dc36-45e8-b043-45038d329396","path":"sprites/spr_gladiator_crest/spr_gladiator_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9b14dec7-6f59-49b0-8561-5319c7501f32","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_chest_variants/5769f893-c909-4b88-9856-62d72a0b6130.png b/sprites/spr_mk7_chest_variants/5769f893-c909-4b88-9856-62d72a0b6130.png index ca85fd7dfe..6d4b97844e 100644 Binary files a/sprites/spr_mk7_chest_variants/5769f893-c909-4b88-9856-62d72a0b6130.png and b/sprites/spr_mk7_chest_variants/5769f893-c909-4b88-9856-62d72a0b6130.png differ diff --git a/sprites/spr_mk7_chest_variants/af74c721-e4c2-4842-b738-a2c688adc317.png b/sprites/spr_mk7_chest_variants/af74c721-e4c2-4842-b738-a2c688adc317.png index d95bc183c3..6cd83367c9 100644 Binary files a/sprites/spr_mk7_chest_variants/af74c721-e4c2-4842-b738-a2c688adc317.png and b/sprites/spr_mk7_chest_variants/af74c721-e4c2-4842-b738-a2c688adc317.png differ diff --git a/sprites/spr_mk7_chest_variants/bc5e2753-207d-403d-81c5-a4e7066de053.png b/sprites/spr_mk7_chest_variants/bc5e2753-207d-403d-81c5-a4e7066de053.png index 351ac62e3a..77b6ecbd6e 100644 Binary files a/sprites/spr_mk7_chest_variants/bc5e2753-207d-403d-81c5-a4e7066de053.png and b/sprites/spr_mk7_chest_variants/bc5e2753-207d-403d-81c5-a4e7066de053.png differ diff --git a/sprites/spr_mk7_chest_variants/ca44f968-4109-4468-901b-d07add46e880.png b/sprites/spr_mk7_chest_variants/ca44f968-4109-4468-901b-d07add46e880.png index 7dc69125d1..875f91af21 100644 Binary files a/sprites/spr_mk7_chest_variants/ca44f968-4109-4468-901b-d07add46e880.png and b/sprites/spr_mk7_chest_variants/ca44f968-4109-4468-901b-d07add46e880.png differ diff --git a/sprites/spr_mk7_chest_variants/d359bd56-6962-4c59-a10d-f16ae433baa8.png b/sprites/spr_mk7_chest_variants/d359bd56-6962-4c59-a10d-f16ae433baa8.png index 5d958d996c..6fa6465fb2 100644 Binary files a/sprites/spr_mk7_chest_variants/d359bd56-6962-4c59-a10d-f16ae433baa8.png and b/sprites/spr_mk7_chest_variants/d359bd56-6962-4c59-a10d-f16ae433baa8.png differ diff --git a/sprites/spr_mk7_chest_variants/layers/5769f893-c909-4b88-9856-62d72a0b6130/d0764e38-6f97-4f33-8770-83719dde468f.png b/sprites/spr_mk7_chest_variants/layers/5769f893-c909-4b88-9856-62d72a0b6130/d0764e38-6f97-4f33-8770-83719dde468f.png index ca85fd7dfe..6d4b97844e 100644 Binary files a/sprites/spr_mk7_chest_variants/layers/5769f893-c909-4b88-9856-62d72a0b6130/d0764e38-6f97-4f33-8770-83719dde468f.png and b/sprites/spr_mk7_chest_variants/layers/5769f893-c909-4b88-9856-62d72a0b6130/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_variants/layers/af74c721-e4c2-4842-b738-a2c688adc317/d0764e38-6f97-4f33-8770-83719dde468f.png b/sprites/spr_mk7_chest_variants/layers/af74c721-e4c2-4842-b738-a2c688adc317/d0764e38-6f97-4f33-8770-83719dde468f.png index d95bc183c3..6cd83367c9 100644 Binary files a/sprites/spr_mk7_chest_variants/layers/af74c721-e4c2-4842-b738-a2c688adc317/d0764e38-6f97-4f33-8770-83719dde468f.png and b/sprites/spr_mk7_chest_variants/layers/af74c721-e4c2-4842-b738-a2c688adc317/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_variants/layers/bc5e2753-207d-403d-81c5-a4e7066de053/d0764e38-6f97-4f33-8770-83719dde468f.png b/sprites/spr_mk7_chest_variants/layers/bc5e2753-207d-403d-81c5-a4e7066de053/d0764e38-6f97-4f33-8770-83719dde468f.png index 351ac62e3a..77b6ecbd6e 100644 Binary files a/sprites/spr_mk7_chest_variants/layers/bc5e2753-207d-403d-81c5-a4e7066de053/d0764e38-6f97-4f33-8770-83719dde468f.png and b/sprites/spr_mk7_chest_variants/layers/bc5e2753-207d-403d-81c5-a4e7066de053/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_variants/layers/ca44f968-4109-4468-901b-d07add46e880/d0764e38-6f97-4f33-8770-83719dde468f.png b/sprites/spr_mk7_chest_variants/layers/ca44f968-4109-4468-901b-d07add46e880/d0764e38-6f97-4f33-8770-83719dde468f.png index 7dc69125d1..875f91af21 100644 Binary files a/sprites/spr_mk7_chest_variants/layers/ca44f968-4109-4468-901b-d07add46e880/d0764e38-6f97-4f33-8770-83719dde468f.png and b/sprites/spr_mk7_chest_variants/layers/ca44f968-4109-4468-901b-d07add46e880/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_variants/layers/d359bd56-6962-4c59-a10d-f16ae433baa8/d0764e38-6f97-4f33-8770-83719dde468f.png b/sprites/spr_mk7_chest_variants/layers/d359bd56-6962-4c59-a10d-f16ae433baa8/d0764e38-6f97-4f33-8770-83719dde468f.png index 5d958d996c..6fa6465fb2 100644 Binary files a/sprites/spr_mk7_chest_variants/layers/d359bd56-6962-4c59-a10d-f16ae433baa8/d0764e38-6f97-4f33-8770-83719dde468f.png and b/sprites/spr_mk7_chest_variants/layers/d359bd56-6962-4c59-a10d-f16ae433baa8/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy b/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy index 3ec8102d72..12fb1b6209 100644 --- a/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy +++ b/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy @@ -3,9 +3,9 @@ "%Name":"spr_mk7_chest_variants", "bboxMode":0, "bbox_bottom":73, - "bbox_left":0, + "bbox_left":51, "bbox_right":112, - "bbox_top":0, + "bbox_top":40, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, @@ -72,11 +72,21 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d359bd56-6962-4c59-a10d-f16ae433baa8","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8a5283cf-1b94-4acb-8e35-054b1b7e9647","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3565a559-326d-41c5-a322-0539e7fd4db8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca44f968-4109-4468-901b-d07add46e880","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dff23688-54a3-4f58-9748-753ea26db022","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af74c721-e4c2-4842-b738-a2c688adc317","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"515d67b4-d543-46e6-8846-2c782789fdc0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5769f893-c909-4b88-9856-62d72a0b6130","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"efe29eea-b902-49f6-84aa-a2ed325b6df6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d359bd56-6962-4c59-a10d-f16ae433baa8","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8a5283cf-1b94-4acb-8e35-054b1b7e9647","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3565a559-326d-41c5-a322-0539e7fd4db8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca44f968-4109-4468-901b-d07add46e880","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"dff23688-54a3-4f58-9748-753ea26db022","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af74c721-e4c2-4842-b738-a2c688adc317","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"515d67b4-d543-46e6-8846-2c782789fdc0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5769f893-c909-4b88-9856-62d72a0b6130","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"efe29eea-b902-49f6-84aa-a2ed325b6df6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_special_helm/8362ac13-7231-4584-a993-c6d4f51343b0.png b/sprites/spr_special_helm/8362ac13-7231-4584-a993-c6d4f51343b0.png index 24bb53f732..b9d638d8ef 100644 Binary files a/sprites/spr_special_helm/8362ac13-7231-4584-a993-c6d4f51343b0.png and b/sprites/spr_special_helm/8362ac13-7231-4584-a993-c6d4f51343b0.png differ diff --git a/sprites/spr_special_helm/layers/8362ac13-7231-4584-a993-c6d4f51343b0/fa0c5af5-97a9-4e40-bd80-2da6efc51b16.png b/sprites/spr_special_helm/layers/8362ac13-7231-4584-a993-c6d4f51343b0/fa0c5af5-97a9-4e40-bd80-2da6efc51b16.png index 24bb53f732..b9d638d8ef 100644 Binary files a/sprites/spr_special_helm/layers/8362ac13-7231-4584-a993-c6d4f51343b0/fa0c5af5-97a9-4e40-bd80-2da6efc51b16.png and b/sprites/spr_special_helm/layers/8362ac13-7231-4584-a993-c6d4f51343b0/fa0c5af5-97a9-4e40-bd80-2da6efc51b16.png differ diff --git a/sprites/spr_special_helm/spr_special_helm.yy b/sprites/spr_special_helm/spr_special_helm.yy index a316e8b055..5a97e145d6 100644 --- a/sprites/spr_special_helm/spr_special_helm.yy +++ b/sprites/spr_special_helm/spr_special_helm.yy @@ -68,7 +68,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8362ac13-7231-4584-a993-c6d4f51343b0","path":"sprites/spr_special_helm/spr_special_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"29377d0a-8ebc-44cf-a0ff-6122525f31aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8362ac13-7231-4584-a993-c6d4f51343b0","path":"sprites/spr_special_helm/spr_special_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"29377d0a-8ebc-44cf-a0ff-6122525f31aa","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_chsword/cf403b7b-a831-4dd7-94fc-490b330d9a3b.png b/sprites/spr_weapon_chsword/cf403b7b-a831-4dd7-94fc-490b330d9a3b.png index 435e10cc68..1aa5798ae2 100644 Binary files a/sprites/spr_weapon_chsword/cf403b7b-a831-4dd7-94fc-490b330d9a3b.png and b/sprites/spr_weapon_chsword/cf403b7b-a831-4dd7-94fc-490b330d9a3b.png differ diff --git a/sprites/spr_weapon_chsword/layers/cf403b7b-a831-4dd7-94fc-490b330d9a3b/024d846f-72e0-44e2-890e-84ac065f8b62.png b/sprites/spr_weapon_chsword/layers/cf403b7b-a831-4dd7-94fc-490b330d9a3b/024d846f-72e0-44e2-890e-84ac065f8b62.png index 435e10cc68..1aa5798ae2 100644 Binary files a/sprites/spr_weapon_chsword/layers/cf403b7b-a831-4dd7-94fc-490b330d9a3b/024d846f-72e0-44e2-890e-84ac065f8b62.png and b/sprites/spr_weapon_chsword/layers/cf403b7b-a831-4dd7-94fc-490b330d9a3b/024d846f-72e0-44e2-890e-84ac065f8b62.png differ diff --git a/sprites/spr_weapon_chsword/spr_weapon_chsword.yy b/sprites/spr_weapon_chsword/spr_weapon_chsword.yy index 946b1ce5d3..6627945f62 100644 --- a/sprites/spr_weapon_chsword/spr_weapon_chsword.yy +++ b/sprites/spr_weapon_chsword/spr_weapon_chsword.yy @@ -68,7 +68,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","path":"sprites/spr_weapon_chsword/spr_weapon_chsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"877d958c-0ba3-4cf7-b6c6-61d21827c596","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","path":"sprites/spr_weapon_chsword/spr_weapon_chsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"877d958c-0ba3-4cf7-b6c6-61d21827c596","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_evisc/774b09dd-5c0c-4e15-8357-7f2df7fe94b8.png b/sprites/spr_weapon_evisc/774b09dd-5c0c-4e15-8357-7f2df7fe94b8.png index 9bfcf6ec87..7949e62972 100644 Binary files a/sprites/spr_weapon_evisc/774b09dd-5c0c-4e15-8357-7f2df7fe94b8.png and b/sprites/spr_weapon_evisc/774b09dd-5c0c-4e15-8357-7f2df7fe94b8.png differ diff --git a/sprites/spr_weapon_evisc/f1061812-3385-46d3-abc9-570c9b907700.png b/sprites/spr_weapon_evisc/f1061812-3385-46d3-abc9-570c9b907700.png index dd1d037c7d..77c437eb7a 100644 Binary files a/sprites/spr_weapon_evisc/f1061812-3385-46d3-abc9-570c9b907700.png and b/sprites/spr_weapon_evisc/f1061812-3385-46d3-abc9-570c9b907700.png differ diff --git a/sprites/spr_weapon_evisc/layers/774b09dd-5c0c-4e15-8357-7f2df7fe94b8/0273a489-1892-4cb4-834b-31fe10ec8fdf.png b/sprites/spr_weapon_evisc/layers/774b09dd-5c0c-4e15-8357-7f2df7fe94b8/0273a489-1892-4cb4-834b-31fe10ec8fdf.png index c714b2327d..eaed65a346 100644 Binary files a/sprites/spr_weapon_evisc/layers/774b09dd-5c0c-4e15-8357-7f2df7fe94b8/0273a489-1892-4cb4-834b-31fe10ec8fdf.png and b/sprites/spr_weapon_evisc/layers/774b09dd-5c0c-4e15-8357-7f2df7fe94b8/0273a489-1892-4cb4-834b-31fe10ec8fdf.png differ diff --git a/sprites/spr_weapon_evisc/layers/774b09dd-5c0c-4e15-8357-7f2df7fe94b8/e92b3c07-a0af-494a-b9d9-c49cd5efb952.png b/sprites/spr_weapon_evisc/layers/774b09dd-5c0c-4e15-8357-7f2df7fe94b8/e92b3c07-a0af-494a-b9d9-c49cd5efb952.png index 09ea76c3d7..fc4a3c61a1 100644 Binary files a/sprites/spr_weapon_evisc/layers/774b09dd-5c0c-4e15-8357-7f2df7fe94b8/e92b3c07-a0af-494a-b9d9-c49cd5efb952.png and b/sprites/spr_weapon_evisc/layers/774b09dd-5c0c-4e15-8357-7f2df7fe94b8/e92b3c07-a0af-494a-b9d9-c49cd5efb952.png differ diff --git a/sprites/spr_weapon_evisc/layers/f1061812-3385-46d3-abc9-570c9b907700/0273a489-1892-4cb4-834b-31fe10ec8fdf.png b/sprites/spr_weapon_evisc/layers/f1061812-3385-46d3-abc9-570c9b907700/0273a489-1892-4cb4-834b-31fe10ec8fdf.png index d0d9f46c8c..92b1a7a45b 100644 Binary files a/sprites/spr_weapon_evisc/layers/f1061812-3385-46d3-abc9-570c9b907700/0273a489-1892-4cb4-834b-31fe10ec8fdf.png and b/sprites/spr_weapon_evisc/layers/f1061812-3385-46d3-abc9-570c9b907700/0273a489-1892-4cb4-834b-31fe10ec8fdf.png differ diff --git a/sprites/spr_weapon_evisc/layers/f1061812-3385-46d3-abc9-570c9b907700/e92b3c07-a0af-494a-b9d9-c49cd5efb952.png b/sprites/spr_weapon_evisc/layers/f1061812-3385-46d3-abc9-570c9b907700/e92b3c07-a0af-494a-b9d9-c49cd5efb952.png index 9c69c0a268..64c68aefcf 100644 Binary files a/sprites/spr_weapon_evisc/layers/f1061812-3385-46d3-abc9-570c9b907700/e92b3c07-a0af-494a-b9d9-c49cd5efb952.png and b/sprites/spr_weapon_evisc/layers/f1061812-3385-46d3-abc9-570c9b907700/e92b3c07-a0af-494a-b9d9-c49cd5efb952.png differ diff --git a/sprites/spr_weapon_evisc/spr_weapon_evisc.yy b/sprites/spr_weapon_evisc/spr_weapon_evisc.yy index a4a001d7dc..d4477705c2 100644 --- a/sprites/spr_weapon_evisc/spr_weapon_evisc.yy +++ b/sprites/spr_weapon_evisc/spr_weapon_evisc.yy @@ -70,8 +70,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"774b09dd-5c0c-4e15-8357-7f2df7fe94b8","path":"sprites/spr_weapon_evisc/spr_weapon_evisc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f876b66-bcbd-438b-9b39-fa9f9f01e467","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1061812-3385-46d3-abc9-570c9b907700","path":"sprites/spr_weapon_evisc/spr_weapon_evisc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"baceab3d-6c5a-4e6b-8c47-dfc2f19f8899","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"774b09dd-5c0c-4e15-8357-7f2df7fe94b8","path":"sprites/spr_weapon_evisc/spr_weapon_evisc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7f876b66-bcbd-438b-9b39-fa9f9f01e467","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1061812-3385-46d3-abc9-570c9b907700","path":"sprites/spr_weapon_evisc/spr_weapon_evisc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"baceab3d-6c5a-4e6b-8c47-dfc2f19f8899","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,