From c53d75b1afe2636228bc5fe4fcdc2bbbcfafadfa Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sun, 7 Sep 2025 01:37:01 +0100 Subject: [PATCH] fix manage button on planet select screen --- objects/obj_controller/Create_0.gml | 1 + objects/obj_controller/Draw_0.gml | 36 ++++++++---------- objects/obj_event_log/Draw_0.gml | 5 +-- objects/obj_star_select/Create_0.gml | 3 ++ objects/obj_star_select/Draw_64.gml | 8 +++- scripts/is_specialist/is_specialist.gml | 8 +--- .../scr_controller_helpers.gml | 22 ++++++----- scripts/scr_ui_manage/scr_ui_manage.gml | 4 ++ .../scr_unit_quick_find_pane.gml | 1 - .../18394c2c-6406-40fe-8ad1-ee4ebd629435.png | Bin 800 -> 800 bytes .../25fd73f2-dbb3-4ee5-8201-8fefbe86bbee.png | Bin 1565 -> 1565 bytes .../afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png | Bin 800 -> 800 bytes .../afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png | Bin 1565 -> 1565 bytes .../mk7_chest_variants/mk7_chest_variants.yy | 8 +++- .../dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c.png | Bin 1099 -> 1099 bytes .../89065597-920b-4d9f-8c26-3b28108bf116.png | Bin 1099 -> 1099 bytes .../spr_da_mk6_helm_crests.yy | 4 +- .../778eed9c-61df-4cb3-b13d-b1945275af2a.png | Bin 1672 -> 1672 bytes .../bec54e42-2d69-41b0-a1d3-e3624a334ed8.png | Bin 1672 -> 1672 bytes .../spr_fur_tail_topknot.yy | 4 +- .../ff8c3aa8-dc36-45e8-b043-45038d329396.png | Bin 1089 -> 1089 bytes .../020e45fd-27e1-48c7-801f-deacfe57d9c1.png | Bin 1089 -> 1089 bytes .../spr_gladiator_crest.yy | 4 +- .../5769f893-c909-4b88-9856-62d72a0b6130.png | Bin 1712 -> 1712 bytes .../af74c721-e4c2-4842-b738-a2c688adc317.png | Bin 1743 -> 1743 bytes .../bc5e2753-207d-403d-81c5-a4e7066de053.png | Bin 1733 -> 1733 bytes .../ca44f968-4109-4468-901b-d07add46e880.png | Bin 634 -> 634 bytes .../d359bd56-6962-4c59-a10d-f16ae433baa8.png | Bin 439 -> 439 bytes .../d0764e38-6f97-4f33-8770-83719dde468f.png | Bin 1712 -> 1712 bytes .../d0764e38-6f97-4f33-8770-83719dde468f.png | Bin 1743 -> 1743 bytes .../d0764e38-6f97-4f33-8770-83719dde468f.png | Bin 1733 -> 1733 bytes .../d0764e38-6f97-4f33-8770-83719dde468f.png | Bin 634 -> 634 bytes .../d0764e38-6f97-4f33-8770-83719dde468f.png | Bin 439 -> 439 bytes .../spr_mk7_chest_variants.yy | 24 ++++++++---- .../8362ac13-7231-4584-a993-c6d4f51343b0.png | Bin 625 -> 625 bytes .../fa0c5af5-97a9-4e40-bd80-2da6efc51b16.png | Bin 625 -> 625 bytes sprites/spr_special_helm/spr_special_helm.yy | 4 +- .../cf403b7b-a831-4dd7-94fc-490b330d9a3b.png | Bin 2685 -> 2685 bytes .../024d846f-72e0-44e2-890e-84ac065f8b62.png | Bin 2685 -> 2685 bytes .../spr_weapon_chsword/spr_weapon_chsword.yy | 4 +- .../774b09dd-5c0c-4e15-8357-7f2df7fe94b8.png | Bin 3839 -> 3839 bytes .../f1061812-3385-46d3-abc9-570c9b907700.png | Bin 3674 -> 3674 bytes .../0273a489-1892-4cb4-834b-31fe10ec8fdf.png | Bin 775 -> 775 bytes .../e92b3c07-a0af-494a-b9d9-c49cd5efb952.png | Bin 3938 -> 3938 bytes .../0273a489-1892-4cb4-834b-31fe10ec8fdf.png | Bin 786 -> 786 bytes .../e92b3c07-a0af-494a-b9d9-c49cd5efb952.png | Bin 3756 -> 3756 bytes sprites/spr_weapon_evisc/spr_weapon_evisc.yy | 8 +++- 47 files changed, 90 insertions(+), 58 deletions(-) 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 9c8bf8478c86e3642c96b0620615e3be66c6d4de..3272765d72fa5fdcf0b917d5597b2ab4bdf1ec1d 100644 GIT binary patch delta 108 zcmZ3$wt#KJR3<4?T?0#91G5k#V=EI2D+5Dq0|P4qgUM1~S502eB#uM+k-M+h~>+1CtO#Q!7JrD`O*V0|P4qgT3!Fk$q$&M X)UfMr{k2+{0SG)@{an^LB{Ts5E?FIY 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 a3a45e1a7634d848d0244dbb01a2e1a2200055b1..df653d98c723a154e507f5ee73ceddad250face3 100644 GIT binary patch delta 126 zcmbQsGnZ$>Bvx-zT?0#91G5k#V=EI2D+5Dq0|P4qgUM1~S1~X!sFt`!l%yncVb}1;-B)b#T~;YI?9y9Bvx+|T>~>+1CtO#Q!7JrD`O*V0|P4qgTUO_Qmu0H qQ!>*k8H@~!uxq&VzU$27yR1@b*ri*4triBF$KdJe=d#Wzp$Pz#6C&LJ 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 7b5d773b82ef3d2c92de61475f1b113a62c4fb3b..3272765d72fa5fdcf0b917d5597b2ab4bdf1ec1d 100644 GIT binary patch delta 108 zcmZ3$wt#KJR3<4?T?0#91G5k#V=EI2D+5Dq0|P4qgUM1~S502eB#uM+k-M+hBvx-zT?0#91G5k#V=EI2D+5Dq0|P4qgUM1~S1~X!sFt`!l%yncVb}1;-B)b#T~;YI?9y9Bvx+|T?12HBjXSw11nQAD?@W_0|P4q1NO|SqYMlTswJ)wB`Jv|saCo9 qDVb@N3`Pb<*fo@y9IBjrmsLs)yR@R><7Ghe7(8A5T-G@yGywoPv>^8Y 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 fbc00612ca789eee6947e7b4af3a86a18538c6d8..61aad66a92ce71d7ce791706822dfd51372dfbc5 100644 GIT binary patch delta 99 zcmX@jahhYpVPwBS3j3^P6(dLvt%5V=F^rZ36=<1A`QQZHdXZn5D4Ei3&|#GMSr2RvC*v TC-zO%3_#%N>gTe~DWM4f+q@Vh 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 fbc00612ca789eee6947e7b4af3a86a18538c6d8..61aad66a92ce71d7ce791706822dfd51372dfbc5 100644 GIT binary patch delta 99 zcmX@jahhYpVPwBS3j3^P6(dLvt%5V=F^rZ36=<1A`QQZHdXZn5D4Ei3&|#GMSr2RvC*v TC-zO%3_#%N>gTe~DWM4f+q@Vh 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 f88531158e04943e673886ee1efbb797f4a8feaa..ce74a3d4220ae64cb68d0614269d60792de0babd 100644 GIT binary patch delta 119 zcmeC+?ciO&=3%L8U>0IzY-M6$WnidnU|?lnFj?yBDh37y)e_f;l9a@fRIA+ll+3hB o1|tI_Q(Xfr8Xmd(icR)llU2qdw>2o|B+xJhPgg&ebxsLQ0942yF#rGn delta 119 zcmeC+?ciO&=3%UBXc}T@Ze?I;Wn!vrU|?lnaC!Ngas~zl)e_f;l9a@fRIA+ll+3hB p1|tI_Q(Xfr8W#NuIX&5fO;#C;+}HP|B0$3!JYD@<);T3K0RX?|At(R< 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 f88531158e04943e673886ee1efbb797f4a8feaa..ce74a3d4220ae64cb68d0614269d60792de0babd 100644 GIT binary patch delta 119 zcmeC+?ciO&=3%L8U>0IzY-M6$WnidnU|?lnFj?yBDh37y)e_f;l9a@fRIA+ll+3hB o1|tI_Q(Xfr8Xmd(icR)llU2qdw>2o|B+xJhPgg&ebxsLQ0942yF#rGn delta 119 zcmeC+?ciO&=3%UBXc}T@Ze?I;Wn!vrU|?lnaC!Ngas~zl)e_f;l9a@fRIA+ll+3hB p1|tI_Q(Xfr8W#NuIX&5fO;#C;+}HP|B0$3!JYD@<);T3K0RX?|At(R< 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 04b591eb74c98733444e83d3d818935bc3a71643..355d83c37963f85ed6e22cb453a79651d1efa721 100644 GIT binary patch delta 99 zcmX@eagbxfPG)gST?4ZaBV#KQ3o8RdZ36=<1B1y@Usp}Oz$}GL?vcB%*knc)S!FEx Twg%;#WB>wBS3j3^P6gTe~DWM4f2|pQ6 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 04b591eb74c98733444e83d3d818935bc3a71643..355d83c37963f85ed6e22cb453a79651d1efa721 100644 GIT binary patch delta 99 zcmX@eagbxfPG)gST?4ZaBV#KQ3o8RdZ36=<1B1y@Usp}Oz$}GL?vcB%*knc)S!FEx Twg%;#WB>wBS3j3^P6gTe~DWM4f2|pQ6 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 ca85fd7dfe5fd6b2d9cf79c953ebf025198c9a50..6d4b97844e75bdf94a82635579af9ae3df1d106c 100644 GIT binary patch delta 99 zcmdnMyMcFu2AjC0u7O#Ik+GGDg_VJ!wt<0_fx%>{ud628vq@o-d*tpbHo1UJRvC-F TtwA{_8Gyjk)z4*}Q$iB}@nac@ delta 99 zcmdnMyMcFu2AjCCu7O2}p_!G5p_QS5wt<0_fq^CWy4cC~Y*N_dJi^2tPA*`RRmP%E T-r3xa0SG)@{an^LB{Ts5ko6Z8 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 d95bc183c39d123b77ca21c0f361f0de79f9b5b6..6cd83367c949db09478433fa9daa5f2751f27368 100644 GIT binary patch delta 99 zcmX@ld!BcLJDa$ru7O#Ik+GGDg_VJ!wt<0_fx%>{ud61Bc&j19Tu6{1-oD!M{ud5gs7*tDKBT7;dOH!?J^HVa@ zDjAFnj7)V6uxNPX?kfh=paIuVl9`)YT#}eufLqVjpq!IHJ)8`lu6{1-oD!M!C8<`q`6-!c zl?+A(My9$3STwwDT-*lKpaIuVl9`)YT#}eufLqU=DNT_;J)8`lu6{1-oD!M{ud5gs7*tDKBT7;dOH!?J^HVa@ qDjAFnj7)V6uxNPX?khIAoKaR8i`>?roRdJq7(8A5T-G@yGywpan;+i* delta 120 zcmdnayq$T2KBI@Ru7Pogk%5(wiIuT|wt<0_fx+jum2(&v7*tDKBT7;dOH!?J^HVa@ qDjAFnj7)*5F*P)8IH)kWoKaR8i`>uUWAJqKb6Mw<&;$VRl_C59 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 ca85fd7dfe5fd6b2d9cf79c953ebf025198c9a50..6d4b97844e75bdf94a82635579af9ae3df1d106c 100644 GIT binary patch delta 99 zcmdnMyMcFu2AjC0u7O#Ik+GGDg_VJ!wt<0_fx%>{ud628vq@o-d*tpbHo1UJRvC-F TtwA{_8Gyjk)z4*}Q$iB}@nac@ delta 99 zcmdnMyMcFu2AjCCu7O2}p_!G5p_QS5wt<0_fq^CWy4cC~Y*N_dJi^2tPA*`RRmP%E T-r3xa0SG)@{an^LB{Ts5ko6Z8 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 d95bc183c39d123b77ca21c0f361f0de79f9b5b6..6cd83367c949db09478433fa9daa5f2751f27368 100644 GIT binary patch delta 99 zcmX@ld!BcLJDa$ru7O#Ik+GGDg_VJ!wt<0_fx%>{ud61Bc&j19Tu6{1-oD!M{ud5gs7*tDKBT7;dOH!?J^HVa@ zDjAFnj7)V6uxNPX?kfh=paIuVl9`)YT#}eufLqVjpq!IHJ)8`lu6{1-oD!M!C8<`q`6-!c zl?+A(My9$3STwwDT-*lKpaIuVl9`)YT#}eufLqU=DNT_;J)8`lu6{1-oD!M{ud5gs7*tDKBT7;dOH!?J^HVa@ qDjAFnj7)V6uxNPX?khIAoKaR8i`>?roRdJq7(8A5T-G@yGywpan;+i* delta 120 zcmdnayq$T2KBI@Ru7Pogk%5(wiIuT|wt<0_fx+jum2(&v7*tDKBT7;dOH!?J^HVa@ qDjAFnj7)*5F*P)8IH)kWoKaR8i`>uUWAJqKb6Mw<&;$VRl_C59 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 24bb53f7321eee276cfa6ebdb29811758b459b14..b9d638d8efed52aac06c2b0008d0c52abc72800a 100644 GIT binary patch delta 98 zcmey!@{wi3OGa@^T?4ZaBV#KQ3o8RdZ36=<1B1y@Usp|HlENnS$lX_LvLTbKG8S!H SgK|zX0D-5gpUXO@geCwx5*jW5 delta 98 zcmey!@{wi3OGa@+T_b}KBV#KQATrW6Ft9Q(2nhK%XA+YXHYr6;H-*WDOtQ*Yw3W%E Q|7QRKPgg&ebxsLQ0RD6syZ`_I 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 24bb53f7321eee276cfa6ebdb29811758b459b14..b9d638d8efed52aac06c2b0008d0c52abc72800a 100644 GIT binary patch delta 98 zcmey!@{wi3OGa@^T?4ZaBV#KQ3o8RdZ36=<1B1y@Usp|HlENnS$lX_LvLTbKG8S!H SgK|zX0D-5gpUXO@geCwx5*jW5 delta 98 zcmey!@{wi3OGa@+T_b}KBV#KQATrW6Ft9Q(2nhK%XA+YXHYr6;H-*WDOtQ*Yw3W%E Q|7QRKPgg&ebxsLQ0RD6syZ`_I 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 435e10cc6812cb926bd866fd633d4846f3bd5abd..1aa5798ae295fcae89d49f33a2a64a878a15db75 100644 GIT binary patch delta 126 zcmew>@>gWTCr)ouT?0#91G5k#V=EI2D+5Dq0|P4qgUM1~S1~X!sFt`!l%yncVb}1;-B)a~EtixUcImA_IVXYUF?hQAxvX@>gWTCr)n@T|+}%1Je)#BP&BAD@>gWTCr)ouT?0#91G5k#V=EI2D+5Dq0|P4qgUM1~S1~X!sFt`!l%yncVb}1;-B)a~EtixUcImA_IVXYUF?hQAxvX@>gWTCr)n@T|+}%1Je)#BP&BAD":"","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 9bfcf6ec87063d27a281dc6eb84d4bac39ce5e08..7949e6297238ec1c3d5285b1bc1fee20d3a8222b 100644 GIT binary patch delta 99 zcmew_`(JiLIiI+tu7O#Ik+GGDg_VJ!wt<0_fx%>{ud62a@kwEmd*tpbHhDjvtTGmT TTZ3{=G5~?6tDnm{r-UW|eeN4f delta 99 zcmew_`(JiLIiI+(u7P=op{bRrv6Ydbwt<0_fx+_?%a|wk@kwEmoAy<1|K$CAvdUQW T9eiM)zyJiEu6{1-oD!MT?6wFLsKhLV=E&=Z36=<1B2%)mN7FhFsPQeMwFx^mZVzc=BH$) qRWcYE7@6uCV9_w`tK9y{Qhc(?SmX{quulLQ#^CAd=d#Wzp$PykL?Lhh 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 c714b2327dbb23c252b38a4d6d5f62902fca841c..eaed65a346bf0763b627ed4e2fd83115bfcbd9a1 100644 GIT binary patch delta 120 zcmZo?YiHX~&*WjLYhV^)WNc+(VP#;bZD3$!U@%$g>na8Y2GtVRh?11Vl2ohQ{FKbJ pN(LhXBU4=iEE*oU`-)9I&LpdhMQ&?Q&PkwQ44$rjF6*2UngF18ASVC- delta 120 zcmZo?YiHX~&*WjOYhWH?Xli9@Y-MDqZD3$!VDNm!GG+z_2GtVRh?11Vl2ohQ{FKbJ qN(LhXBU4=iEE=YLmD@l0IFqb07P*5D>=S^7F?hQAxvXzopr08K0-8vpOR7n8W9u7O#Ik+GGDg_VJ!wt<0_fx%>{ud606WReQUBKOGMSB!yyL8HVq tq9i4;B-N@UGdH!kBr&&u!N|bKRM!BDo~=PSCxLnxJYD@<);T3K0RRz6A#nfz delta 123 zcmbQlHi>OR7n8WLu7P=op{bRrv6Ydbwt<0_fx+_?%a|uGWReQUA~)@;+UZu7Rblfmw)=v6YF1m4TtQfq|8Q!DOkgs~8vUO_Qmu0H qQ!>*k8H@~!uxoha?khGqhfhikyY$weoRdKF7(8A5T-G@yGywojMj<5t delta 126 zcmZ1@yGC|{BA>U3u7Rblp=F4nk(H^bm65Twfq|8Q!CB|#Oa=x9)e_f;l9a@fRIA+l pl+3hB1|tI_>>BpSSzn!;!zZPNUHUb*6c^Au22WQ%mvv4FO#m}YAQ}Jw 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,