From 063543e549fbf49b48d97b15b4b03ab87c46cfe8 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 23 Aug 2025 03:40:57 +0100 Subject: [PATCH 1/3] bundle of fixes --- objects/obj_controller/Alarm_1.gml | 2 +- objects/obj_controller/Create_0.gml | 16 +- objects/obj_mass_equip/Create_0.gml | 2 +- objects/obj_mass_equip/Draw_0.gml | 22 +- objects/obj_mass_equip/Step_0.gml | 4 +- scripts/scr_ComplexSet/scr_ComplexSet.gml | 2 +- scripts/scr_buttons/scr_buttons.gml | 65 ++++- .../scr_culture_visuals.gml | 7 + scripts/scr_powers/scr_powers.gml | 32 +++ scripts/scr_ui_manage/scr_ui_manage.gml | 234 +++++++++--------- .../ca9af1f8-d9c1-4f87-b306-8aaff6acf541.png | Bin 1859 -> 0 bytes .../dd7d5c23-a6af-4857-8741-b07293907895.png | Bin 1884 -> 0 bytes .../5f4f0795-cb93-46e3-9a51-5771616e403f.png | Bin 1859 -> 0 bytes .../818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png | Bin 469 -> 0 bytes .../5f4f0795-cb93-46e3-9a51-5771616e403f.png | Bin 1884 -> 0 bytes .../818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png | Bin 469 -> 0 bytes .../spr_dread_assault_cannon.yy | 18 +- .../430ba383-8c34-4c5c-a443-2005ddb354ff.png | Bin 2030 -> 0 bytes .../6692383a-0d7e-4194-998f-fc3bf2067f77.png | Bin 1976 -> 0 bytes .../9093f3a1-b3fd-4c9b-af10-612dea29d004.png | Bin 2030 -> 0 bytes .../9093f3a1-b3fd-4c9b-af10-612dea29d004.png | Bin 1976 -> 0 bytes .../spr_dread_autocannon.yy | 16 +- .../c66f97c4-ce8b-427b-8ab0-baac7d95dda9.png | Bin 1696 -> 0 bytes .../edc36065-c8cc-48b7-b999-6a9a9665befa.png | Bin 1693 -> 0 bytes .../0a188212-4756-437d-9b06-5ec78990fa63.png | Bin 1696 -> 0 bytes .../0a188212-4756-437d-9b06-5ec78990fa63.png | Bin 1693 -> 0 bytes sprites/spr_dread_claw/spr_dread_claw.yy | 12 +- .../9fa15ed7-cd79-4acd-83d9-95ecf0be332f.png | Bin 2097 -> 0 bytes .../b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6.png | Bin 2131 -> 0 bytes .../8032ff11-29ed-4780-ac80-92b6e1c5e7aa.png | Bin 2097 -> 0 bytes .../8032ff11-29ed-4780-ac80-92b6e1c5e7aa.png | Bin 2131 -> 0 bytes .../spr_dread_heavy_bolter.yy | 16 +- .../eb254b9d-bb2c-41f8-9e62-ad9069c99560.png | Bin 1539 -> 0 bytes .../f5bd9088-45e5-4695-a241-41e7835f44fd.png | Bin 1556 -> 0 bytes .../750c31f7-7377-4a6c-809a-4f9444c3a1e7.png | Bin 1539 -> 0 bytes .../818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png | Bin 469 -> 0 bytes .../750c31f7-7377-4a6c-809a-4f9444c3a1e7.png | Bin 1556 -> 0 bytes .../818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png | Bin 469 -> 0 bytes .../spr_dread_iron_clad.yy | 12 +- .../48994d0c-01f0-441c-9383-c0eafe9cae39.png | Bin 1774 -> 0 bytes .../fc539d0b-b559-4265-95a9-df8bac65ea2b.png | Bin 1786 -> 0 bytes .../1d4cccd9-bb49-4325-8933-45f465f70841.png | Bin 1774 -> 0 bytes .../818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png | Bin 469 -> 0 bytes .../1d4cccd9-bb49-4325-8933-45f465f70841.png | Bin 1786 -> 0 bytes .../818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png | Bin 469 -> 0 bytes .../spr_dread_lascannon.yy | 16 +- .../098fd89a-d321-4251-b0f3-70132fea3997.png | Bin 1487 -> 0 bytes .../7fa6bc12-162e-4538-92df-3bc73caec0ee.png | Bin 1538 -> 0 bytes .../818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png | Bin 469 -> 0 bytes .../c8fad8b0-70d6-45c8-a8ed-2c1e3cb3673e.png | Bin 1487 -> 0 bytes .../818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png | Bin 469 -> 0 bytes .../c8fad8b0-70d6-45c8-a8ed-2c1e3cb3673e.png | Bin 1538 -> 0 bytes .../spr_dread_missile/spr_dread_missile.yy | 16 +- .../76458a7c-df41-4efe-ac58-2273c4d3e898.png | Bin 1973 -> 0 bytes .../e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3.png | Bin 1958 -> 0 bytes .../818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png | Bin 469 -> 0 bytes .../ccd559cd-c323-4e0f-b733-5bf644ca1b41.png | Bin 1973 -> 0 bytes .../818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png | Bin 469 -> 0 bytes .../ccd559cd-c323-4e0f-b733-5bf644ca1b41.png | Bin 1958 -> 0 bytes .../spr_dread_plasma_cannon.yy | 16 +- 60 files changed, 298 insertions(+), 210 deletions(-) delete mode 100644 sprites/spr_dread_assault_cannon/ca9af1f8-d9c1-4f87-b306-8aaff6acf541.png delete mode 100644 sprites/spr_dread_assault_cannon/dd7d5c23-a6af-4857-8741-b07293907895.png delete mode 100644 sprites/spr_dread_assault_cannon/layers/ca9af1f8-d9c1-4f87-b306-8aaff6acf541/5f4f0795-cb93-46e3-9a51-5771616e403f.png delete mode 100644 sprites/spr_dread_assault_cannon/layers/ca9af1f8-d9c1-4f87-b306-8aaff6acf541/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png delete mode 100644 sprites/spr_dread_assault_cannon/layers/dd7d5c23-a6af-4857-8741-b07293907895/5f4f0795-cb93-46e3-9a51-5771616e403f.png delete mode 100644 sprites/spr_dread_assault_cannon/layers/dd7d5c23-a6af-4857-8741-b07293907895/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png delete mode 100644 sprites/spr_dread_autocannon/430ba383-8c34-4c5c-a443-2005ddb354ff.png delete mode 100644 sprites/spr_dread_autocannon/6692383a-0d7e-4194-998f-fc3bf2067f77.png delete mode 100644 sprites/spr_dread_autocannon/layers/430ba383-8c34-4c5c-a443-2005ddb354ff/9093f3a1-b3fd-4c9b-af10-612dea29d004.png delete mode 100644 sprites/spr_dread_autocannon/layers/6692383a-0d7e-4194-998f-fc3bf2067f77/9093f3a1-b3fd-4c9b-af10-612dea29d004.png delete mode 100644 sprites/spr_dread_claw/c66f97c4-ce8b-427b-8ab0-baac7d95dda9.png delete mode 100644 sprites/spr_dread_claw/edc36065-c8cc-48b7-b999-6a9a9665befa.png delete mode 100644 sprites/spr_dread_claw/layers/c66f97c4-ce8b-427b-8ab0-baac7d95dda9/0a188212-4756-437d-9b06-5ec78990fa63.png delete mode 100644 sprites/spr_dread_claw/layers/edc36065-c8cc-48b7-b999-6a9a9665befa/0a188212-4756-437d-9b06-5ec78990fa63.png delete mode 100644 sprites/spr_dread_heavy_bolter/9fa15ed7-cd79-4acd-83d9-95ecf0be332f.png delete mode 100644 sprites/spr_dread_heavy_bolter/b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6.png delete mode 100644 sprites/spr_dread_heavy_bolter/layers/9fa15ed7-cd79-4acd-83d9-95ecf0be332f/8032ff11-29ed-4780-ac80-92b6e1c5e7aa.png delete mode 100644 sprites/spr_dread_heavy_bolter/layers/b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6/8032ff11-29ed-4780-ac80-92b6e1c5e7aa.png delete mode 100644 sprites/spr_dread_iron_clad/eb254b9d-bb2c-41f8-9e62-ad9069c99560.png delete mode 100644 sprites/spr_dread_iron_clad/f5bd9088-45e5-4695-a241-41e7835f44fd.png delete mode 100644 sprites/spr_dread_iron_clad/layers/eb254b9d-bb2c-41f8-9e62-ad9069c99560/750c31f7-7377-4a6c-809a-4f9444c3a1e7.png delete mode 100644 sprites/spr_dread_iron_clad/layers/eb254b9d-bb2c-41f8-9e62-ad9069c99560/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png delete mode 100644 sprites/spr_dread_iron_clad/layers/f5bd9088-45e5-4695-a241-41e7835f44fd/750c31f7-7377-4a6c-809a-4f9444c3a1e7.png delete mode 100644 sprites/spr_dread_iron_clad/layers/f5bd9088-45e5-4695-a241-41e7835f44fd/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png delete mode 100644 sprites/spr_dread_lascannon/48994d0c-01f0-441c-9383-c0eafe9cae39.png delete mode 100644 sprites/spr_dread_lascannon/fc539d0b-b559-4265-95a9-df8bac65ea2b.png delete mode 100644 sprites/spr_dread_lascannon/layers/48994d0c-01f0-441c-9383-c0eafe9cae39/1d4cccd9-bb49-4325-8933-45f465f70841.png delete mode 100644 sprites/spr_dread_lascannon/layers/48994d0c-01f0-441c-9383-c0eafe9cae39/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png delete mode 100644 sprites/spr_dread_lascannon/layers/fc539d0b-b559-4265-95a9-df8bac65ea2b/1d4cccd9-bb49-4325-8933-45f465f70841.png delete mode 100644 sprites/spr_dread_lascannon/layers/fc539d0b-b559-4265-95a9-df8bac65ea2b/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png delete mode 100644 sprites/spr_dread_missile/098fd89a-d321-4251-b0f3-70132fea3997.png delete mode 100644 sprites/spr_dread_missile/7fa6bc12-162e-4538-92df-3bc73caec0ee.png delete mode 100644 sprites/spr_dread_missile/layers/098fd89a-d321-4251-b0f3-70132fea3997/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png delete mode 100644 sprites/spr_dread_missile/layers/098fd89a-d321-4251-b0f3-70132fea3997/c8fad8b0-70d6-45c8-a8ed-2c1e3cb3673e.png delete mode 100644 sprites/spr_dread_missile/layers/7fa6bc12-162e-4538-92df-3bc73caec0ee/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png delete mode 100644 sprites/spr_dread_missile/layers/7fa6bc12-162e-4538-92df-3bc73caec0ee/c8fad8b0-70d6-45c8-a8ed-2c1e3cb3673e.png delete mode 100644 sprites/spr_dread_plasma_cannon/76458a7c-df41-4efe-ac58-2273c4d3e898.png delete mode 100644 sprites/spr_dread_plasma_cannon/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3.png delete mode 100644 sprites/spr_dread_plasma_cannon/layers/76458a7c-df41-4efe-ac58-2273c4d3e898/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png delete mode 100644 sprites/spr_dread_plasma_cannon/layers/76458a7c-df41-4efe-ac58-2273c4d3e898/ccd559cd-c323-4e0f-b733-5bf644ca1b41.png delete mode 100644 sprites/spr_dread_plasma_cannon/layers/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png delete mode 100644 sprites/spr_dread_plasma_cannon/layers/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3/ccd559cd-c323-4e0f-b733-5bf644ca1b41.png diff --git a/objects/obj_controller/Alarm_1.gml b/objects/obj_controller/Alarm_1.gml index 394ae2956a..31ec9f359d 100644 --- a/objects/obj_controller/Alarm_1.gml +++ b/objects/obj_controller/Alarm_1.gml @@ -419,7 +419,7 @@ if (did){ } } - + instance_activate_object(obj_ini); if (field=="both"){ if (obj_ini.fleet_type==ePlayerBase.penitent) then orkz+=3; orkz+=3; diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index b5398e6f74..cecc4fbf2e 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -97,6 +97,8 @@ chapter_made = 0; // obj_cuicons.alarm[1]=1; // Clean up custom icons map_scale = 1; scale_mod = 1; +unit_manage_constants = {}; +unit_manage_constants.current_data = [-1,-1]; diplomacy_pathway = ""; @@ -435,14 +437,14 @@ unit_bio=false; view_squad=false; company_report=false; company_data = {}; -obj_controller.unit_focus = false; +unit_focus = false; filter_mode = false; manage_tags = []; -pauldron_trim=0; -last_unit=[0,0]; +pauldron_trim = 0; +last_unit = [0,0]; ui_coloring=""; -ui_melee_penalty=0; -ui_ranged_penalty=0; +ui_melee_penalty = 0; +ui_ranged_penalty = 0; management_tags = []; // ** Sets default mouse vars ** @@ -711,6 +713,7 @@ sel_system_x=0; sel_system_y=0; popup_master_crafted=0; close_popups = true; +unit_manage_image = false; // ** Sets starting turn ** turn=1; // turn=40; @@ -1220,7 +1223,7 @@ serialize = function(){ } var excluded_from_save = ["temp", "serialize", "deserialize", "build_chaos_gods", "company_data","menu_buttons", - "location_viewer", "production_research_pathways", "specialist_point_handler", "spec_train_data", "tooltips", "last_unit", "unit_manage_constants"], + "location_viewer", "production_research_pathways", "specialist_point_handler", "spec_train_data", "tooltips", "last_unit", "unit_manage_constants", "unit_manage_image"], var excluded_from_save_start = ["restart_"]; copy_serializable_fields(object_controller, save_data, excluded_from_save, excluded_from_save_start); @@ -1231,7 +1234,6 @@ serialize = function(){ // Deserialization is done within scr_load #endregion - // ** Loads the game ** if (global.load>=0){ load_game=global.load; diff --git a/objects/obj_mass_equip/Create_0.gml b/objects/obj_mass_equip/Create_0.gml index ef526b2f8f..6d290e7d66 100644 --- a/objects/obj_mass_equip/Create_0.gml +++ b/objects/obj_mass_equip/Create_0.gml @@ -1,5 +1,5 @@ -tab=0; +tab=-1; role=obj_controller.settings; refresh=true; engage=false; diff --git a/objects/obj_mass_equip/Draw_0.gml b/objects/obj_mass_equip/Draw_0.gml index 767a8f5153..239f7dbe21 100644 --- a/objects/obj_mass_equip/Draw_0.gml +++ b/objects/obj_mass_equip/Draw_0.gml @@ -60,7 +60,7 @@ if (total_role_number>0){ -if (total_role_number > 0 && tab > 0) { +if (total_role_number > 0 && tab > -1) { item_name = []; var infanty_roles = [ eROLE.ChapterMaster, @@ -83,12 +83,12 @@ if (total_role_number > 0 && tab > 0) { eROLE.Dreadnought, ]; // hand slots - if ((tab == 1 || tab ==2) && array_get_index(infanty_roles, obj_controller.settings) >= 0) { + if ((tab == 0 || tab ==1) && array_get_index(infanty_roles, obj_controller.settings) >= 0) { // Get all available hand weapons scr_get_item_names( item_name, obj_controller.settings, // eROLE - 1, // slot + 0, // slot eENGAGEMENT.Any, true, // include the company standard false, // do not limit to available items @@ -96,7 +96,7 @@ if (total_role_number > 0 && tab > 0) { scr_get_item_names( item_name, obj_controller.settings, // eROLE - 2, // slot + 1, // slot eENGAGEMENT.Any, false, // include the company standard false, // do not limit to available items @@ -160,19 +160,19 @@ if (total_role_number > 0 && tab > 0) { switch (tab) { // slots - case 1: obj_ini.wep1[100, role] = buh; break; - case 2: obj_ini.wep2[100, role] = buh; break; - case 3: + case 0: obj_ini.wep1[100, role] = buh; break; + case 1: obj_ini.wep2[100, role] = buh; break; + case 2: obj_ini.armour[100, role] = buh; // No bikes or jump packs for Terminators if (array_contains(LIST_TERMINATOR_ARMOUR, buh) || buh == STR_ANY_TERMINATOR_ARMOUR) { obj_ini.mobi[100, role] = ""; } break; - case 4: obj_ini.gear[100, role] = buh; break; - case 5: obj_ini.mobi[100, role] = buh; break; + case 3: obj_ini.gear[100, role] = buh; break; + case 4: obj_ini.mobi[100, role] = buh; break; } - tab = 0; + tab = -1; refresh = true; } } @@ -191,7 +191,7 @@ if (total_role_number > 0 && tab > 0) { draw_rectangle(xx + 1347 - (string_width(string_hash_to_newline("CANCEL")) / 2), yy + 720, xx + 1347 + (string_width(string_hash_to_newline("CANCEL")) / 2), yy + 741, 0); draw_set_alpha(1); if (scr_click_left()) { - tab = 0; + tab = -1; } } draw_set_alpha(1); diff --git a/objects/obj_mass_equip/Step_0.gml b/objects/obj_mass_equip/Step_0.gml index 641abd9526..ce017b94ec 100644 --- a/objects/obj_mass_equip/Step_0.gml +++ b/objects/obj_mass_equip/Step_0.gml @@ -264,9 +264,9 @@ try { refresh = false; - if (tab > 0) { + if (tab > -1) { item_name = []; - var is_hand_slot = tab == 1 || tab == 2; + var is_hand_slot = tab == 0 || tab == 1; scr_get_item_names( item_name, obj_controller.settings, // eROLE diff --git a/scripts/scr_ComplexSet/scr_ComplexSet.gml b/scripts/scr_ComplexSet/scr_ComplexSet.gml index b3bc31b1e5..a505b3fb51 100644 --- a/scripts/scr_ComplexSet/scr_ComplexSet.gml +++ b/scripts/scr_ComplexSet/scr_ComplexSet.gml @@ -760,7 +760,7 @@ function ComplexSet(_unit) constructor { draw_sprite(weapon_right.sprite, 0, x_surface_offset + weapon_right.ui_xmod, y_surface_offset + weapon_right.ui_ymod); } if ((weapon_left.sprite != 0) && sprite_exists(weapon_left.sprite)) { - draw_sprite(weapon_left.sprite, 0, x_surface_offset + weapon_left.ui_xmod, y_surface_offset + weapon_left.ui_ymod); + draw_sprite(weapon_left.sprite, 1, x_surface_offset + weapon_left.ui_xmod, y_surface_offset + weapon_left.ui_ymod); } exit; } diff --git a/scripts/scr_buttons/scr_buttons.gml b/scripts/scr_buttons/scr_buttons.gml index 2dcf6b5c61..59008f816e 100644 --- a/scripts/scr_buttons/scr_buttons.gml +++ b/scripts/scr_buttons/scr_buttons.gml @@ -24,6 +24,69 @@ function pop_draw_return_values(){ array_delete(global.draw_return_stack, _index, 1); } } + +function ReactiveString(text,x1=0,y1=0,data = false) constructor{ + self.x1 = x1; + self.y1 = y1; + x2 = 0; + y2 = 0; + halign = fa_left; + valign = fa_top; + + self.text = text; + text_max_width = -1; + font = fnt_40k_14; + colour = CM_GREEN_COLOR; + tooltip = ""; + max_width = -1; + h = 0; + w = 0; + + move_data_to_current_scope(data); + + static update = function(data = {}){ + move_data_to_current_scope(data); + add_draw_return_values(); + draw_set_font(font); + draw_set_halign(halign); + draw_set_valign(valign); + + if (max_width>-1){ + w = string_width_ext(text, -1, max_width); + h = string_height_ext(text, -1, max_width); + x2 = x1 + w; + y2 = y1 + h; + } + + pop_draw_return_values(); + } + + update(); + + static hit = function(){ + return scr_hit(x1,y1,x2,y2); + } + + static draw = function(){ + add_draw_return_values(); + draw_set_font(font); + draw_set_halign(halign); + draw_set_valign(valign); + draw_set_color(colour); + + if (max_width>-1){ + draw_text_ext_outline(x1, y1, text, -1, 187, 0, c_black, colour); + } else { + draw_text_outline(x1, y1, text, c_black, colour); + } + if (hit()){ + tooltip_draw(tooltip); + } + pop_draw_return_values(); + } +} + + //position, icon, text, text_max_width, tooltip, text_position, font = fnt_40k_14, colour = CM_GREEN_COLOR function LabeledIcon(icon, text,x1=0,y1=0,data = false) constructor{ @@ -52,7 +115,7 @@ function LabeledIcon(icon, text,x1=0,y1=0,data = false) constructor{ draw_set_font(font); if (text_position == "right"){ w = x1 + icon_width + 2 + string_width(text);; - x2 = w; + x2 = x1 + w; h = icon_height; y2 = y1 + icon_height; } diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index a6dbd3b1c2..ddd41bc5ed 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -1901,6 +1901,7 @@ base: { sprite: spr_weapon_assca, body_types: [3], armours : ["Dreadnought"], + new_weapon_draw: true }], }, "Heavy Flamer": { @@ -1936,6 +1937,7 @@ base: { sprite: spr_dread_lascannon, body_types: [3], armours : ["Dreadnought"], + new_weapon_draw: true } ], }, @@ -1946,6 +1948,7 @@ base: { display_type: "dreadnought", }, armours : ["Dreadnought"], + new_weapon_draw: true }, variants: [ { @@ -2037,6 +2040,7 @@ base: { sprite: spr_dread_plasma_cannon, body_types: [3], armours : ["Dreadnought"], + new_weapon_draw: true } ], }, @@ -2286,6 +2290,7 @@ base: { sprite: spr_dread_missile, body_types: [3], armours : ["Dreadnought"], + new_weapon_draw: true } ] }, @@ -2311,6 +2316,7 @@ base: { sprite: spr_dread_plasma_cannon, body_types: [3], armours : ["Dreadnought"], + new_weapon_draw: true } ] }, @@ -2495,6 +2501,7 @@ base: { sprite: spr_dread_autocannon, body_types: [3], armours : ["Dreadnought"], + new_weapon_draw: true } ] }, diff --git a/scripts/scr_powers/scr_powers.gml b/scripts/scr_powers/scr_powers.gml index 5bc90366b4..987efda029 100644 --- a/scripts/scr_powers/scr_powers.gml +++ b/scripts/scr_powers/scr_powers.gml @@ -17,6 +17,38 @@ global.disciplines_data = json_to_gamemaker(working_directory + "\\data\\psychic_disciplines.json", json_parse); global.powers_data = json_to_gamemaker(working_directory + "\\data\\psychic_powers.json", json_parse); +function generate_marine_powers_description_string(unit){ + var _psy_powers_known = unit.powers_known; + var _psy_powers_count = array_length(_psy_powers_known); + var _psy_discipline = unit.psy_discipline(); + var _psy_discipline_name = get_discipline_data(_psy_discipline, "name"); + + var _tooltip = ""; + _tooltip += $"Psychic Rating: {unit.psionic}"; + + var _equipment_psychic_amplification = unit.gear_special_value("psychic_amplification"); + var _character_psychic_amplification = unit.psychic_amplification() * 100; + var _equipment_psychic_focus = unit.gear_special_value("psychic_focus"); + var _character_psychic_focus = unit.psychic_focus(); + var _perils_chance = unit.perils_threshold() / 10; + _tooltip += $"\nAmplification from Equipment: {_equipment_psychic_amplification}%"; + _tooltip += $"\nAmplification from Attributes (Psy Rating and EXP): {_character_psychic_amplification}%"; + + _tooltip += $"\n\nFocus Success Chance: {100 - unit.psychic_focus_difficulty()}%"; + _tooltip += $"\nFocus from Equipment: {_equipment_psychic_focus}%"; + _tooltip += $"\nFocus from Attributes (WIS and EXP): {_character_psychic_focus}%"; + + _tooltip += $"\n\nPerils of the Warp Chance: {_perils_chance}%"; + + _tooltip += $"\n\nMain Discipline: {_psy_discipline_name}"; + _tooltip += $"\nKnown Powers: "; + for (var i = 0; i < _psy_powers_count; i++) { + _tooltip += get_power_data(_psy_powers_known[i], "name"); + _tooltip += smart_delimeter_sign(_psy_powers_count, i, false); + } + return _tooltip; +} + /// @desc Psychic powers execution mess. Called in the scope of obj_pnunit. /// @param {real} caster_id - ID of the caster in the player column from obj_pnunit. /// @mixin diff --git a/scripts/scr_ui_manage/scr_ui_manage.gml b/scripts/scr_ui_manage/scr_ui_manage.gml index 8158ccc27b..007cc4ec9e 100644 --- a/scripts/scr_ui_manage/scr_ui_manage.gml +++ b/scripts/scr_ui_manage/scr_ui_manage.gml @@ -127,79 +127,90 @@ function command_slot_draw(xx, yy, slot_text){ } function reset_manage_unit_constants(unit){ + try{ + delete unit_manage_constants; tooltips = {}; unit_manage_constants = {}; last_unit = [unit.company, unit.marine_number]; marine_armour[0] = unit.armour(); fix_right = 0; equip_data = unit.unit_equipment_data(); - temp[100] = "1"; + unit_manage_constants.faction_owner = "1"; if (unit.race() != 1) { - temp[100] = unit.race(); + unit_manage_constants.owner = unit.race(); } + unit_manage_constants.current_data = last_unit; + var _damage_res = unit.damage_resistance(); - tooltips.armour = is_struct(equip_data.armour_data) ? equip_data.armour_data.item_tooltip_desc_gen() : ""; + //armour + var _data = { + tooltip :$"==Armour==\n {is_struct(equip_data.armour_data) ? equip_data.armour_data.item_tooltip_desc_gen() : ""}", + colour : quality_color(unit.armour_quality), + max_width : 187, + } + unit_manage_constants.armour_string = new ReactiveString(unit.equipments_qual_string("armour", true), 0,0,_data); // Sets up the description for the equipement of current marine - //temp[103]=""; + // Gear - unit_manage_constants.gear = unit.gear(); - tooltips.gear = is_struct(equip_data.gear_data) ? equip_data.gear_data.item_tooltip_desc_gen() : ""; - //if (string_count("&",unit_manage_constants.gear)>0) then unit_manage_constants.gear=clean_tags(unit_manage_constants.gear); - // Mobility Item - unit_manage_constants.mobility = unit.mobility_item(); + var _data = { + tooltip : $"==Gear==\n{is_struct(equip_data.gear_data) ? equip_data.gear_data.item_tooltip_desc_gen() : ""}", + colour : quality_color(unit.gear_quality), + max_width : 187, + } + + unit_manage_constants.gear_string = new ReactiveString(unit.equipments_qual_string("gear", true), 0,0,_data); + + //mobility + var _data = { + tooltip : $"==Back/Mobilitiy==\n{is_struct(equip_data.mobility_data) ? equip_data.mobility_data.item_tooltip_desc_gen() : ""}", + colour : quality_color(unit.mobility_item_quality), + max_width : 187, + } + + unit_manage_constants.mobi_string = new ReactiveString(unit.equipments_qual_string("mobi", true), 0,0,_data); + + var _data = { + tooltip : $"==First Weapon==\n{is_struct(equip_data.gear_data) ? equip_data.gear_data.item_tooltip_desc_gen() : ""}", + colour : quality_color(unit.weapon_one_quality), + max_width : 187, + } + + unit_manage_constants.wep1_string = new ReactiveString(unit.equipments_qual_string("wep1", true), 0,0,_data); + + //mobility + var _data = { + tooltip : $"==Second Weapon==\n{is_struct(equip_data.mobility_data) ? equip_data.mobility_data.item_tooltip_desc_gen() : ""}", + colour : quality_color(unit.weapon_two_quality), + max_width : 187, + } - tooltips.mobility = is_struct(equip_data.mobility_data) ? equip_data.mobility_data.item_tooltip_desc_gen() : ""; + unit_manage_constants.wep2_string = new ReactiveString(unit.equipments_qual_string("wep2", true), 0,0,_data); - tooltips.weapon_one = is_struct(equip_data.weapon_one_data) ? equip_data.weapon_one_data.item_tooltip_desc_gen() : ""; - tooltips.weapon_two = is_struct(equip_data.weapon_two_data) ? equip_data.weapon_two_data.item_tooltip_desc_gen() : ""; - //if (string_count("&",unit_manage_constants.mobility)>0) then unit_manage_constants.mobility=clean_tags(unit_manage_constants.mobility); // Psyker things - unit_manage_constants.psionic = ""; - tooltips.psy = ""; + var _psionic = ""; var _psy_powers_known = unit.powers_known; var _psy_powers_count = array_length(_psy_powers_known); + var _tooltip = ""; if (_psy_powers_count > 0) { - var _psy_discipline = unit.psy_discipline(); - var _psy_discipline_name = get_discipline_data(_psy_discipline, "name"); - unit_manage_constants.psionic = $"{unit.psionic}/{_psy_powers_count}"; - - var _tooltip = ""; - _tooltip += $"Psychic Rating: {unit.psionic}"; - - var _equipment_psychic_amplification = unit.gear_special_value("psychic_amplification"); - var _character_psychic_amplification = unit.psychic_amplification() * 100; - var _equipment_psychic_focus = unit.gear_special_value("psychic_focus"); - var _character_psychic_focus = unit.psychic_focus(); - var _perils_chance = unit.perils_threshold() / 10; - _tooltip += $"\nAmplification from Equipment: {_equipment_psychic_amplification}%"; - _tooltip += $"\nAmplification from Attributes (Psy Rating and EXP): {_character_psychic_amplification}%"; - - _tooltip += $"\n\nFocus Success Chance: {100 - unit.psychic_focus_difficulty()}%"; - _tooltip += $"\nFocus from Equipment: {_equipment_psychic_focus}%"; - _tooltip += $"\nFocus from Attributes (WIS and EXP): {_character_psychic_focus}%"; - - _tooltip += $"\n\nPerils of the Warp Chance: {_perils_chance}%"; - - _tooltip += $"\n\nMain Discipline: {_psy_discipline_name}"; - _tooltip += $"\nKnown Powers: "; - for (var i = 0; i < _psy_powers_count; i++) { - _tooltip += get_power_data(_psy_powers_known[i], "name"); - _tooltip += smart_delimeter_sign(_psy_powers_count, i, false); - } - tooltips.psy = _tooltip; + _psionic = $"{unit.psionic}/{_psy_powers_count}"; + _tooltip = generate_marine_powers_description_string(unit); } + // Corruption - if ((obj_controller.chaos_rating > 0) && (unit_manage_constants.psionic != "")) { - unit_manage_constants.psionic += "#" + string(max(0, unit.corruption())) + "% Corruption."; - } - if ((obj_controller.chaos_rating > 0) && (unit_manage_constants.psionic == "")) { - unit_manage_constants.psionic = string(max(0, unit.corruption())) + "% Corruption."; + if ((obj_controller.chaos_rating > 0) && (_psionic != "")) { + _psionic = $"{_psionic}\n{max(0, unit.corruption())}% Corruption."; } + + unit_manage_constants.psy = new LabeledIcon(spr_icon_psyker, _psionic, 0, 0, { + icon_width : 24, + icon_height : 24, + tooltip: $"==Psychic Stats==\n{_tooltip}", + }); // Damage Resistance var _res_tool = "Health damage taken by the marine is reduced by this percentage. This happens after the flat reduction from armor.\n\nContributing factors:\n"; @@ -243,11 +254,11 @@ function reset_manage_unit_constants(unit){ tooltip: _res_tool, }) - if (is_struct(temp[121])) { + if (is_struct(unit_manage_image)) { try { - temp[121].destroy_image(); + unit_manage_image.destroy_image(); } - delete temp[121]; + delete unit_manage_image; } var _hp_val = $"{round(unit.hp())}/{round(unit.max_health())}"; var _hp_tool = "A measure of how much punishment the creature can take. Marines can go into the negatives and still survive, but they'll require a bionic to become fighting fit once more.\n\nContributing factors:\n"; @@ -428,12 +439,16 @@ function reset_manage_unit_constants(unit){ icon_height : 24, tooltip: _bionic_tool, }); - temp[121] = unit.draw_unit_image(); + + unit_manage_image = unit.draw_unit_image(); temp[122] = unit.handle_stat_growth(); /*if (man[sel]="vehicle"){ // TODO }*/ + } catch(_exception){ + //not sure handling with normal method exception could just be a pain here + } } function company_specific_management(){ add_draw_return_values(); @@ -541,6 +556,9 @@ function draw_sprite_and_unit_equip_data(){ draw_set_font(fnt_40k_14b); if (is_struct(obj_controller.unit_focus)) { var selected_unit = obj_controller.unit_focus; //unit struct + if (!array_equals([selected_unit.company, selected_unit.marine_number], unit_manage_constants.current_data)){ + reset_manage_unit_constants(selected_unit); + } ///tooltip_text stacks hover over type tooltips into an array and draws them last so as not to create drawing order issues draw_set_color(c_red); var no_other_instances = !instance_exists(obj_temp3) && !instance_exists(obj_popup); @@ -578,8 +596,8 @@ function draw_sprite_and_unit_equip_data(){ // Draw unit image draw_set_color(c_white); - if (is_struct(obj_controller.temp[121])) { - obj_controller.temp[121].draw(xx + 320, yy + 109); + if (is_struct(obj_controller.unit_manage_image)) { + obj_controller.unit_manage_image.draw(xx + 320, yy + 109); } //TODO implement tooltip explaining potential loyalty hit of demoting a sgt @@ -626,6 +644,7 @@ function draw_sprite_and_unit_equip_data(){ draw_set_font(fnt_40k_30b); draw_text_transformed_outline(_name_box.x1, _name_box.y3, _name_box.text3, 0.7, 0.7, 0); + // Draw unit info draw_set_font(fnt_40k_14); // Left side of the screen @@ -633,66 +652,38 @@ function draw_sprite_and_unit_equip_data(){ var x_left = xx + 22; // Equipment - var armour = selected_unit.armour(); - if (armour != "") { - text = selected_unit.equipments_qual_string("armour", false); - tooltip_text = tooltips.armour; - x1 = x_left; - y1 = yy + 179; - x2 = x1 + string_width_ext(text, -1, 187); - y2 = y1 + string_height_ext(text, -1, 187); - draw_set_alpha(1); - draw_text_ext_outline(x1, y1, text, -1, 187, 0, quality_color(selected_unit.armour_quality)); - array_push(_unit_tooltips, [tooltip_text, [x1, y1, x2, y2], "Armour"]); - } + var _armour = unit_manage_constants.armour_string; - var gear = selected_unit.gear(); - if (selected_unit.gear() != "") { - text = selected_unit.equipments_qual_string("gear", false); - tooltip_text = tooltips.gear; - x1 = x_left; - y1 = yy + 305; - x2 = x1 + string_width_ext(text, -1, 187); - y2 = y1 + string_height_ext(text, -1, 187); - draw_text_ext_outline(x1, y1, text, -1, 187, 0, quality_color(selected_unit.gear_quality)); - array_push(_unit_tooltips, [tooltip_text, [x1, y1, x2, y2], "Gear"]); - } + _armour.update({x1:x_left, y1 :yy + 179}); - var mobi = selected_unit.mobility_item(); - if (mobi != "") { - text = selected_unit.equipments_qual_string("mobi", false); - tooltip_text = tooltips.mobility; - x1 = x_left; - y1 = yy + 326; - x2 = x1 + string_width_ext(text, -1, 187); - y2 = y1 + string_height_ext(text, -1, 187); - draw_text_ext_outline(x1, y1, text, -1, 187, 0, quality_color(selected_unit.mobility_item_quality)); - array_push(_unit_tooltips, [tooltip_text, [x1, y1, x2, y2], "Back/Mobilitiy"]); - } + _armour.draw(); - var wep1 = selected_unit.weapon_one(); - if (wep1 != "") { - text = selected_unit.equipments_qual_string("wep1", false); - tooltip_text = tooltips.weapon_one; - x1 = x_left; - y1 = yy + 204; - x2 = x1 + string_width_ext(text, -1, 187); - y2 = y1 + string_height_ext(text, -1, 187); - draw_text_ext_outline(x1, y1, text, -1, 187, 0, quality_color(selected_unit.weapon_one_quality)); - array_push(_unit_tooltips, [tooltip_text, [x1, y1, x2, y2], "First Weapon"]); - } + var _gear = unit_manage_constants.gear_string; + + _gear.update({x1:x_left, y1 :yy + 305}); + + _gear.draw(); + + + var _mobi = unit_manage_constants.mobi_string; + + _mobi.update({x1:x_left, y1 :yy + 326}); + + _mobi.draw(); - var wep2 = selected_unit.weapon_two(); - if (wep2 != "") { - text = selected_unit.equipments_qual_string("wep2", false); - tooltip_text = tooltips.weapon_two; - x1 = x_left; - y1 = yy + 254; - x2 = x1 + string_width_ext(text, -1, 187); - y2 = y1 + string_height_ext(text, -1, 187); - draw_text_ext_outline(x1, y1, text, -1, 187, 0, quality_color(selected_unit.weapon_two_quality)); - array_push(_unit_tooltips, [tooltip_text, [x1, y1, x2, y2], "Second Weapon"]); - } + + var _wep1 = unit_manage_constants.wep1_string; + + _wep1.update({x1:x_left, y1 :yy + 204}); + + _wep1.draw(); + + + var _wep2 = unit_manage_constants.wep2_string; + + _wep2.update({x1:x_left, y1 :yy + 254}); + + _wep2.draw(); // Stats // Bionics trackers @@ -728,20 +719,17 @@ function draw_sprite_and_unit_equip_data(){ unit_manage_constants.damage_res.draw(); - // Psyker things - if (obj_controller.unit_manage_constants.psionic != "") { - text = obj_controller.unit_manage_constants.psionic; - tooltip_text = obj_controller.tooltips.psy; - x1 = x_left + 110; - y1 = yy + 43; - x2 = x1 + string_width(text); - y2 = y1 + string_height(text); - x3 = x1 - 26; - y3 = y1 - 4; - draw_sprite_stretched(spr_icon_psyker, 0, x3, y3, 24, 24); - draw_text_outline(x1, y1, text); - array_push(_unit_tooltips, [tooltip_text, [x3, y1, x2, y2], "Psychic Stats"]); + // Psyker things + + if (array_length(selected_unit.powers_known)){ + unit_manage_constants.psy.update({ + x1 : x_left+84, + y1: yy+39, + }); + + unit_manage_constants.psy.draw(); } + unit_manage_constants.melee_attack.update({ x1 : x_left-6, y1: yy+111, diff --git a/sprites/spr_dread_assault_cannon/ca9af1f8-d9c1-4f87-b306-8aaff6acf541.png b/sprites/spr_dread_assault_cannon/ca9af1f8-d9c1-4f87-b306-8aaff6acf541.png deleted file mode 100644 index f2bc367bc2d6292d2ffd07f28210b3d7e9486647..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1859 zcma)6dobJi7XN8QNg1)5%HFzBb*c6$61A!kDwVc0K}1pdP>*O+`7J7Js#2A1yB=E< z^O`|_!4MWvSJ12e&oR6J1>yw+=a`ptQa0+MI$?Bms*wa(Ksw$uMla@z? z`DE-^(u@Mze!st5sR+Bk^FOi$wT1{rk~dWn`MX4)ukH$dkXr}ayKQdB8dj8cm!xky z)v6^d#?&VWEhB9VRhrdAx)F(+YVm0B$MyQoFSofDpDOh9LAXwRYO3$qi_C!LSCw4S z4&i~~6ZdFAMBUCxL`rNxMKDZ0fR?;77g!ZpHUG7nx`dfFq z3nIO4+O|Nz7_=IEQtbn$zio@kI!?(ZyI}gj zk&x9ENTi#p3&Ov$-p*5ZFmK%GNMNW`El{QxCHr*TllQNye4-3KC4O6DiUj3Idze)N z_(37>&XUeeU45KyQ2ClJwU*)=<}(-U!`)DPLUW7OBZb>Jq5h=wT{JE_{>7E$#q5+e zT?0@j%(29Ol>0`syYzY{mm5g)c@@VSZc7+9y~Q<4^O7U&q_o!BJC2@tE@WB&D=pFO zzSiJ#g8~>#FDV+bE#O(Xkc|Xo6_LC67n-j)SE)y1{$6$vRcB`ddP8rAltV2C<5v}* zruU2~E&Q_29r-d)t8h4UtjJ(iT7fhKQ*4{nIU~udbDe70uLowk8!p`)HbM0uOIsAh zX)Up7>?U`%%Ni4Re%vzDP!#bGLM1nxzGO0R=Gyn$0$)VEPRuCr8smFQvgn%EotmN@ zG|rgrWb7>BR5&&pwy2sqKa{%nAer%K_AkHWtS6hrK#Trwf61x8M0_8z-M?gI1$#&&)K5Bm+VIA`aKVCfa1JOM+{GT?06 ztqnt)1Y8eAaX7Zd?oFNl5Z?72-JZB#@tF}ce@ZqrHa>oJo&as&U6a-kMn6Et|vSS!g<0-;>qe@1XPZ)b9DqcyHYWt$&(7!mq&P}2aHWL!L(GLWyw?EQ@o z_95Bd_wrruy&^@&=L$>VaH{MuCeQcJ?B@Sl{)LAl*pJ7IXGHJN* zt27M&_85By8w}RQ{?KXcVI1}l&fduygTY}iT^1#m|3?5uN6;g${juPeYkwQk2=@QC f1CtKY;+Uae%pYr}8QXULKE3C0Z({wii=2N0wvAMP diff --git a/sprites/spr_dread_assault_cannon/dd7d5c23-a6af-4857-8741-b07293907895.png b/sprites/spr_dread_assault_cannon/dd7d5c23-a6af-4857-8741-b07293907895.png deleted file mode 100644 index a92a9c65d05c5b453f46dbd5afcdfbf8e5704118..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1884 zcma)6X;70{7X4TU(I7Z92{hf2u!hYLRs#lEf&@gC009i31P}rUVo->Lj4Ng8d*d^B7_h%(

3(6MT2s^&*e^?UX1sXFhRcW&JuuQ=e$ zDUiCJIsgD5thZ;79J%tdqNXaZ(dtJbayUx#4)Oy4iU|PF@&I64PSI8XAOisatLFd! zRS5v#w3?p+UE~+4F}|lff&H($Zm{vTobbnbx&>#>etgq;@pYJv>VjbOAC*^V8SE&( zmWE2Nd<9M}ZPUJ-vifmL&w5uwk5w@mL3=t2#?EV2XsPJ8nx^mCDgzZ@O zpzY)b=kF})EV zL3uVR%yJ(oe5~uob$8C*-l^RUVf4~{HRT#u?4D?goN$yaqqilC)%%-PsP+OW_qE{<~QfaZ8ex4m>k845}a3 z)Sf9g**{%L0*m+d&^jfU0qTy!5OqgKOG~_t>ar{;EG%53woa~&(23HLgV`I!4h%I+ zr`BYWIbA8IH-bw>y$N@-he)N;C2fwP<0m2>N_|DYrf4t$tWu*7ugx}jh%=3t-%=GQpU zrIKJSXb)`#GsWpy7M@?g^j2=n3sG{U^5WK3U-rl4Ws~^s@Z*mQF0W>+S@XMAkXh2* zUH#~xY&dk1_M{IagU@7UW)@lUV+NyA2cv!%@}Ec_(Rj(`EwGEGHN1Xxx^jBFr{-iD z{pp`(^I?!lVSaUWb(=Jl#p%%}-#Tqpwft?1l8EHktVcf#MU$)MX;k?Dw2DYsy_C9+ z(AKtB=Q_j6l{U(tuAeMTA*Gn(*THwNy$=sOUiBo{on8!KNzS%smhqftePZfl3`_pA z(1y&)8Ucd=!USSbc1hG^k})=EvO&p z6p(sx=jogMj9`g-NPnmwKX?iRf8C4@IRVmUzGAvd+#={*zMu zhJRewks58kEl0ksW)K{biKr+kZHdd~$Jk!`Yll*r@KtP&iXg{&lP zb^?wOlC>C2Jf4|u9KMY#sHo4thJxw1QUh(Dt}i6JNz<=%Rlvz;uNPEQfj=+Z`o3De zKksE@r@o6^5r4>v8)!U33Mh{~&V{&l;ut9;_yS>goV&7Z??{|>JYrX&)R=-8?u!0H zANKzdA&T}Dc3t%JDYd%>a+xt16Go0bPmV(o)8pg-AQ4DAD};>|(l*$}5oKeGLONO? z5GVw~FJ7|PE3irOg^8I_WK?!qx8kE&0{fVJloyR G-S`c5EJSkv diff --git a/sprites/spr_dread_assault_cannon/layers/ca9af1f8-d9c1-4f87-b306-8aaff6acf541/5f4f0795-cb93-46e3-9a51-5771616e403f.png b/sprites/spr_dread_assault_cannon/layers/ca9af1f8-d9c1-4f87-b306-8aaff6acf541/5f4f0795-cb93-46e3-9a51-5771616e403f.png deleted file mode 100644 index 3758dd29beefba488fa9103b08ca924059e8a546..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1859 zcma)6eK4Ep7Js#(WEruW%HFzBHB@^QiCWr7R4Q$0f{3E@Lw!Uym3L8LQU+s9^^y3vG-#t}@3iZy8d_mUwJKE_-}_dPNZjn)nLBg;*gJckIp;Ue`JLaKGxN-I zcvPPgM(|y5004}FXBGLlw$Wd)#^IW!FD8Esnva{e=#yL6b9V=>a0_QUD4O9l*yEFa>T2JP6V^vW z`4sGU@~jfuad)6xr3^n`5pZ}5Y6}&PrfjMu^0!I8U)~n}Ah!*1bl=>NHLj=}E=u2Y zY1B(tjJaIg)9BpXT%k`jwuoYBIkg~bTbb@J z&`RRs>SJI%m6wMQQ zNC{VWL}n=5)?scT%S-h?65~-4F>2;bbP$L&;Y~H;hPl0!<5Nuwh%=@kOxKvE)5z5& z2BUo5yUK#+=;0*v)bf1*C{*P4Pme%}15PRg((vft5XQ#F(oP71dYYMy(!}YetgX%( zMdWhk6E>Tj))?9qc!uDfc$Yr*WXyw_{d8c!`+3y;9w-@1fz*4!nQz*ovyM@-DFjR( zI2yXz3W@d8^g;NSw%aQ-ovdruIun^{bt{zVP0c#^reP6~`jI<|CnBU-A@VwwmFRvEQZaK7b|Yqe%9_8(;jQ1uRWpbzwBST)>wAYoPc zac1|p%E~|c?BUOYbxNm$M~jRU(n_Q;m}=jm$r(*qo$J!be%r6;ZoGJV#0=GgENxX5 z^IGG0oMsOWVU2}5H(?!SEROtzSjCTEESU|SzViLHpy$!Ak}^uX#|1u;EQa=Vr>E%$ zOfzP>m|qleE1g@6Th+~7?@K*;kSsy!F$y*>TSBa5SMA8-b6y@-9e>RUx! z>wZY#kD|W|mBXB+TnaI(6-G&6^&Y)Jc>)*;O&$CP?++MbajvczA<|1Cc_N0WW5nII zOBaSV3%nYJ;&ScL^=0Kb{OfxEA$%G-yS;F~;WH!Y0n}_-TtdR?JQ3Q!yCtt9OibF^ z+Dv%;wTiEtwEq&bC%bZSaZxaeLZLXJKDI>S$qKwAqq&1>oJ}K87nhb)4|}d@-Y%cq zxoWfXcDLMS$ME(&66k?goW7Ait~+ z_8~dn_X^zZyd=jY#SMFPO~DzSae*( zWx5ssM~tJB9R_RXc<>a~1&2L|b9AxAU~m|W3v({@e*|DmBqQp|p9_v-{RvvZzW;V$ dF+h4eD-4YNbB&4B<*7fW_d4c7YB+j<`)_>9Q?vj8 diff --git a/sprites/spr_dread_assault_cannon/layers/ca9af1f8-d9c1-4f87-b306-8aaff6acf541/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_assault_cannon/layers/ca9af1f8-d9c1-4f87-b306-8aaff6acf541/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index 189fecdf4d7f631b131044a78c987dbfbf52de8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^M}hbS2OE%#=TeXWQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^&T-Kr(75hW>!C8<`)MX5lF!N|bKMAyJj*T^`; z(A>(<*viOU+rYrez`#7`bt8&~-29Zxv`X9>+zf+lff_X6Hk4%MrWThZ<`&@ABdAjJ P2o##0u6{1-oD!M diff --git a/sprites/spr_dread_assault_cannon/layers/dd7d5c23-a6af-4857-8741-b07293907895/5f4f0795-cb93-46e3-9a51-5771616e403f.png b/sprites/spr_dread_assault_cannon/layers/dd7d5c23-a6af-4857-8741-b07293907895/5f4f0795-cb93-46e3-9a51-5771616e403f.png deleted file mode 100644 index a92a9c65d05c5b453f46dbd5afcdfbf8e5704118..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1884 zcma)6X;70{7X4TU(I7Z92{hf2u!hYLRs#lEf&@gC009i31P}rUVo->Lj4Ng8d*d^B7_h%(

3(6MT2s^&*e^?UX1sXFhRcW&JuuQ=e$ zDUiCJIsgD5thZ;79J%tdqNXaZ(dtJbayUx#4)Oy4iU|PF@&I64PSI8XAOisatLFd! zRS5v#w3?p+UE~+4F}|lff&H($Zm{vTobbnbx&>#>etgq;@pYJv>VjbOAC*^V8SE&( zmWE2Nd<9M}ZPUJ-vifmL&w5uwk5w@mL3=t2#?EV2XsPJ8nx^mCDgzZ@O zpzY)b=kF})EV zL3uVR%yJ(oe5~uob$8C*-l^RUVf4~{HRT#u?4D?goN$yaqqilC)%%-PsP+OW_qE{<~QfaZ8ex4m>k845}a3 z)Sf9g**{%L0*m+d&^jfU0qTy!5OqgKOG~_t>ar{;EG%53woa~&(23HLgV`I!4h%I+ zr`BYWIbA8IH-bw>y$N@-he)N;C2fwP<0m2>N_|DYrf4t$tWu*7ugx}jh%=3t-%=GQpU zrIKJSXb)`#GsWpy7M@?g^j2=n3sG{U^5WK3U-rl4Ws~^s@Z*mQF0W>+S@XMAkXh2* zUH#~xY&dk1_M{IagU@7UW)@lUV+NyA2cv!%@}Ec_(Rj(`EwGEGHN1Xxx^jBFr{-iD z{pp`(^I?!lVSaUWb(=Jl#p%%}-#Tqpwft?1l8EHktVcf#MU$)MX;k?Dw2DYsy_C9+ z(AKtB=Q_j6l{U(tuAeMTA*Gn(*THwNy$=sOUiBo{on8!KNzS%smhqftePZfl3`_pA z(1y&)8Ucd=!USSbc1hG^k})=EvO&p z6p(sx=jogMj9`g-NPnmwKX?iRf8C4@IRVmUzGAvd+#={*zMu zhJRewks58kEl0ksW)K{biKr+kZHdd~$Jk!`Yll*r@KtP&iXg{&lP zb^?wOlC>C2Jf4|u9KMY#sHo4thJxw1QUh(Dt}i6JNz<=%Rlvz;uNPEQfj=+Z`o3De zKksE@r@o6^5r4>v8)!U33Mh{~&V{&l;ut9;_yS>goV&7Z??{|>JYrX&)R=-8?u!0H zANKzdA&T}Dc3t%JDYd%>a+xt16Go0bPmV(o)8pg-AQ4DAD};>|(l*$}5oKeGLONO? z5GVw~FJ7|PE3irOg^8I_WK?!qx8kE&0{fVJloyR G-S`c5EJSkv diff --git a/sprites/spr_dread_assault_cannon/layers/dd7d5c23-a6af-4857-8741-b07293907895/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_assault_cannon/layers/dd7d5c23-a6af-4857-8741-b07293907895/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index 189fecdf4d7f631b131044a78c987dbfbf52de8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^M}hbS2OE%#=TeXWQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^&T-Kr(75hW>!C8<`)MX5lF!N|bKMAyJj*T^`; z(A>(<*viOU+rYrez`#7`bt8&~-29Zxv`X9>+zf+lff_X6Hk4%MrWThZ<`&@ABdAjJ P2o##0u6{1-oD!M diff --git a/sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy b/sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy index 075658e397..58efcb6ac7 100644 --- a/sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy +++ b/sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy @@ -4,7 +4,7 @@ "bboxMode":0, "bbox_bottom":147, "bbox_left":25, - "bbox_right":183, + "bbox_right":182, "bbox_top":50, "collisionKind":1, "collisionTolerance":0, @@ -13,8 +13,6 @@ "For3D":false, "frames":[ {"$GMSpriteFrame":"v1","%Name":"c84e228f-f302-4ca0-ac09-90b28770fca7","name":"c84e228f-f302-4ca0-ac09-90b28770fca7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"dd7d5c23-a6af-4857-8741-b07293907895","name":"dd7d5c23-a6af-4857-8741-b07293907895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"ca9af1f8-d9c1-4f87-b306-8aaff6acf541","name":"ca9af1f8-d9c1-4f87-b306-8aaff6acf541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"3ad2a58f-8454-4fc8-9d66-a796634adeca","name":"3ad2a58f-8454-4fc8-9d66-a796634adeca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, @@ -53,7 +51,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":4.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -67,15 +65,19 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.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":"c84e228f-f302-4ca0-ac09-90b28770fca7","path":"sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67b44acf-1538-46ea-b63a-b708f7af59df","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd7d5c23-a6af-4857-8741-b07293907895","path":"sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f524085d-2d17-489f-8e0d-f55c64069e77","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca9af1f8-d9c1-4f87-b306-8aaff6acf541","path":"sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"59917853-4104-45d6-a027-7f36bdb206d7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ad2a58f-8454-4fc8-9d66-a796634adeca","path":"sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d3ba6aa-ccf9-4708-858a-ec292b2c1b52","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c84e228f-f302-4ca0-ac09-90b28770fca7","path":"sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"67b44acf-1538-46ea-b63a-b708f7af59df","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ad2a58f-8454-4fc8-9d66-a796634adeca","path":"sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2d3ba6aa-ccf9-4708-858a-ec292b2c1b52","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_dread_autocannon/430ba383-8c34-4c5c-a443-2005ddb354ff.png b/sprites/spr_dread_autocannon/430ba383-8c34-4c5c-a443-2005ddb354ff.png deleted file mode 100644 index bd8d3dc7fe8bb89d7fa8fdc5ffb463c6de225da9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2030 zcma)7doy}0?p_JZ6?jicUa&J?S z%UDxCqvevz`ONw-9EGWuLbD$DLQwoq^XD>GZNH_ujsTlyUDJ`Wg0015a09-TxAc_HC ze{>lIX(MgO2f3bc1SCKF3AH9qTKMeZc-s30i^rxBXWDcCbiyx+UURA8<^rH@1SGS* zlMnbo=+ulreQKaV7uV1$o9bI9j7X_$W4ncQj`MWjLhplrcWYnuyf0{tV+y4=M7Sc9nd0l!Eywd9U z2T4S-kR3Ji6*86kr0vd-at1|gx%ISua|j{X2PtjVO_6*^$)icW=+VF_-`O;{7_~}z zM=E1#?*3wbBS9ow3pr$F&!t@Avs#5Y%lfatDnxwHP*<8;fWsbDrYhMWd+PUX8!_hn zuGNPdwsUhI25*rdTte;x($T#Rc){|TX>BAU4t2YksA9}ZF zTjl*%CbLVE)OoM3v1Uaq+WPp?E@@Lk4&+)T&)OxcpOK5c%iWv_M^BP<1^VdD`L%D~ zP9!X?&GUubt-RE{c>hapZqI%ah-ps>EN_#Hv7>(8RDQqN^X%)cFQ5?9B3H#j8EXXY z2@nMLn&8R>T)u=p5dWCZcMIjR()BfQ8d{t2^8cO^f>GLf;!96xP*sui*V*9>X^)dmEg>{U0QzUYP2Bfg@*{ zmNr0Dh>7-{K1{|)44-s<4mlP(*{jx$$MJ1z6(of3`>@Y(H!nm7m=<+ETQC0dCJ9CC zLi?wm+`m|q$N}|!E2!BXJKA`xddu;(x6?z0okJwLYRIW zZx~FBwC_ec8(zHM``?W|N+`^9uSN}p+&G|YXGNk3M}!2{ut@`?(Ds?N?%+~74kc!9{^?rw9p0Zav#0>)pA_X;G(yWuiN zetXojLq9`R%FQ!zMiDnX+S@~QYgP_w`v?xHX~(RhFCA0sbM~2owy2|I)aYHc_3za+ zPUTq-+0r@h*cl8xhe+}G+_vWK82%s}(c8q~jv8e|hKb4|eOi4M)&&h*kH-1!(62Pv z$^3v^Y7$krUao0YkR(Y-Oi9)}Z{ab_Le`#Oj!vzMw_(rMc(tpSRyz7-W3_B(ot@`w ztuGZ~19NY`0>@-uSNu|?jk+~lUQ>Kbq0sW2XES|FKO+(SO|R~r_4r$PEsMGG5xvAR z^#&B}7f;$~B>t9> z9B6iZQs?CF3Um?AZHf>No@odIfwEVp*~p2GBKPG81iv_e$VM79O)S@rvTICi3k%b* z1I^&NG5wkX&8=#tSG0Civo$w*x(v=ZQmPR3^_CDbm3XZ0DD&*dtRlE&SS1VY8e<{Y zHeAzSD;t627xyj`S*_JR3x!R#rI}sm$9vf|eEW9?Jo2xurQ(&;k2fyrRxyv_`vNKk z4CIPJjQ0MM4jMROf*|4%;iF|)GP99@L6fE6j8ec$K_kNg1MVX*bbNmQh zPja*#kK;=K{SyAcnm8}hQ90Mi2>`QlBXlp5ZBCyq6x(k#iw2#NthD;z@i~Kd#xg10 zbkD?(Ge`BD!nT9OcGQ_V^fd3db3jgMGuo6rurHgzQOF6+WFxiM-58#!kBjJW$IM`H z8n6GbgMYaqb{z3-bR=Ubmj8k2l@pcT{AlC8LMF*Uf<5j=Y~k3LfC$&mJ)b0OFjI z&rPc!)-`@){}sV`d(S0k!PUy;ynSf`aBSYgto|5nL+CW@^_Usx=RU_zuvQ8->@*OC zuK&i1s-<*8oYQ$+$Yoq8A~-fw3V=Dx{DcY2!o;^LwBt<}M*g`^p685bLiy;v8#ed$+`=c}7GxvNm=X~Fsx#!+9Hw))%FAvrN z0{|fJa2<0~im#=6MOH@YeZglnrEoUj`b{SQh|>jt?;irdfi(2}3IIeS0AS4z0L;q( zKqKsNm&;{oLguccJqGyn*`9RQ7fJ(-4j3EP7|tfoCXe5*CNsx8dqQBaVpAf&4~bMj z{gh@%t6tHP89ElYo_0c(KB#x4={`!Ppw^%5r_QUb`&s99Q8tkvNxTw2ri?E*^3fZw zw}wA1t@LGUuw0aMEJ5u+jX5JhlXpUYdik!jt_ppyjQX(GJq!3|P^<<&^?fp=Q|Bvn z=HJK5S%UDj#@!>+8mY|kUTb`DV5HDAErnQ~xzD$5YG))`tbY=V7^m~Z;>p=6@gl=C zHC*;8w=L%c+54N)$xKBsO3;*?tfKVELh^B^i9r$~6Z^sylUBN3U$B(V(>}fcJN1pl zbN=&P{;v-R`zCS0o3ZSA#3c|dD`Rp}60z+8zAj>=U&7&MeFZ9u>!%Xw$E%uo85^5I zEVpgda#x9EbNT~kpeK7~KJYCL`L8&F;LmrqkkDmFygcnmx-HBqNzxG`sK-*ByVA4# zPH{-wHZurw)A=MdqLMR#p&VEx>?6eNLkoWpJw?FLx^yIVq z81@+by&e_>D#`HIRP%UiYN$G$(e}X}gNfpal!Peiw=y=cRrEDmliK~x`wXmAf!yy9 zN}C{hrHiVbfBO#JkO%9>P@FbJhrJ78u{icUd-uhL;QUlgzG36~Z7~P=KV+vm@Tnt>r0AyUBd{)eeHZc?&$ezaQ?>;`KwzMt}6E`biZq zab?+g%+!5AA%FD(htjoC9Y!82i#d=~G_wL>tiP0&lc_oy+5SP>3qSH)n4!X54YSc; zSh{Eg6wt5|9+DYIb`9YTgw)Gf(C#HKRT|StWY;Yl7i{?RPV{TZ&PLvwL%70g^!Vi^ zEB^*Ds9M$+SykEi79OF!GqLgSOEWJzckR+@u~e2u_JpK%<}Z=`NTbl*2Wunm?p@FB z>dXE7dfZzk)lr!q8j7WPk!q%mu|;kY%`>CVWHT#Mw4CFzGvmfD>ug`-Ec=*sn9z}b z+*6Tqe)R5&9gK;v(p3#6<`B=c8t7}MpC`=sJWe?b%ME|UbLqTDI`nSYB#(24^)=Vv z9V!gpnZ6WPGbdPwoVSRN_hAaMhItXD`A;AG=b?1AP^s4KeI$< zaqZB>YcXLDdcN(Q3AgD5 zNwhS3C@;Xj>|mDt!-~|OjS|f@B-7K5UK@h5i-hPe`v<;&)hf|`Xz{20oz#pyDH|GP z=Mfd?9~ERC5D_E=0Es}F=p&5vjf`E9M&?Eca|HS#Lh2Ew>p6e?pMVq^NVpgK_X13t lF-ay}0?p_JZ6?jicUa&J?S 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 lF-a":"", @@ -66,15 +64,19 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.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":"745b9ec2-90a6-4381-a7d8-db8fb386297b","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7320a661-0b33-46b9-b0be-0961bc655444","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"430ba383-8c34-4c5c-a443-2005ddb354ff","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bce7996c-812d-45ff-9c6e-22f2033544fa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6692383a-0d7e-4194-998f-fc3bf2067f77","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b3edbe84-c124-4a89-a211-f745d8629411","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2567bd58-d13d-4cd9-9979-937b4d54e288","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a239dd57-a41e-4c43-b5f5-aad2886cf134","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"745b9ec2-90a6-4381-a7d8-db8fb386297b","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7320a661-0b33-46b9-b0be-0961bc655444","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2567bd58-d13d-4cd9-9979-937b4d54e288","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a239dd57-a41e-4c43-b5f5-aad2886cf134","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_dread_claw/c66f97c4-ce8b-427b-8ab0-baac7d95dda9.png b/sprites/spr_dread_claw/c66f97c4-ce8b-427b-8ab0-baac7d95dda9.png deleted file mode 100644 index e36bcc888a68f8f8922139bd31625ca4f6a569e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1696 zcma)6doR^DL53jc$2_7Miu>u?ItWtdgSJSn^n2+pLi1F~s5uP3l%AwD4L(^Va;4+a20 z-3^Pz$+1Tsb0B4TJ_Uy8$pJ#Z;tl~o{7wK!Ne6&0@>0qi0K`H8;2jW?qp|MngjGEMQAb^|N|~xUb7G8(hIO-82+@ z$c@xPWy8wO1-|e(0p=RP>1F9mI01}XjzTI_X^_$WAveq52Tk2`&DQ1`vb?m`gR?+N zXbqc+CxLV)w@Nh(C~ghe$e0_3l8W;jJ0%)w0iJ^9($CUa*CA4JhF0A; zQQSv6dy)~O>h;2kkuzL_CH;QIxQ%tm>`5TQ0-gIDM=|b{LOFX z*!y+Pwaswxcf(aAtrmjv?XNYa^9hnGK_9V8y1Pch8;TA%?qhd*eGqQ6tPRn-oGoD# z@M^FwYw{7H{fRdgHW251Y&BE$MDI@P#1G-wlagg=&pe_cOBG%>@nFj4=u^U~WapUr zfcci}NWW&X(*2_zgB|?|DQ7Y^K_eN5xwB4`K(^OMXJ8@OLxEVRh8f>9=STeQ&m0;T zPuZ4?Y-I8)%bo1MUUV2O($8?tdDN7h5oE6ALC7u-y5Y~jH~309UWC+Q(SUt|)kria zrcIqx2<{O)V%^ORcf9|q`-_-nd~9?N#v+)M+P-VEPAj!QzHsI!>Q^71G!%Utw*-ZmwE zokd-pXn2)L?ziG-2uzdE`_p^ELZ(>`5~ZYVr_{g>59qOVsxWFv=60Uo&XV{Jp)x{^ ztJIZPb$B+vYD{r#VmUrrYg%!zRXq2;D@-=ajepsZ-0?DM3Kmd5o*7wOpcvg@9sBLzLcMzfKJCl9P@9e1ddEV^@QQiVNdQgRNJ0yLc$% z^9L@UWNyCI+C^iIFj!9Je3L9gY1c7=!Vi7J{~^(qRb(lxr2?R;R?gZ%!T3>52U3C& z1X8dZ0BfkVttE7irM1nGJurl=En=_rE+`ZMg&NVzQvV}}h&mm1Chq$J??HnDa)If; e8z^BB!DLEcMD+JHD&2^gZ@0T)JkfPXeA?d;n&EK( diff --git a/sprites/spr_dread_claw/edc36065-c8cc-48b7-b999-6a9a9665befa.png b/sprites/spr_dread_claw/edc36065-c8cc-48b7-b999-6a9a9665befa.png deleted file mode 100644 index 6fdaf272c3a763f8bf06604be5a801d1148415b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1693 zcmeAS@N?(olHy`uVBq!ia0vp^M}hbS2OE%#=TeXWQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^^Xu_C?62)bQm!@>w^5H?m?wWwQg*uFtih@7T9Bw${CFoZt*J zkVw!GCR58)lllLg&HreNL`j>woF7v|6hpYgVH;9IWaE>k@!u z;XDvo)CVGqYYbYNgssdZmP>Ix_Kvhrv0f_iS6$td)l%ixl=ZXrm#?;LX_~zH(Berq z^d+1Qs&B{#s(+$4-Mek?J8_>Hy=X<${z<2;I|F)FcjB;lfAQnB%M@n!_xE3WUvuf2m=mL{lVee88Tx$7mpJ-Q_u&#cn)$osASYjvCCI?Ydg{G6=n!CRaPcE-$0toVC( z*6%NW7?+2d7vGcWKQX&qDbLNzzTCwZ=x=?!^=J8islLzLvrnTgO<8u~1BcRweY#hA zuZO$tRg4t&itdpStI6~hytJ+6(pTM&t(~K_Ci3m!D}`m3cwJ6)Up&uX@-P0ru>e=ms$Yx! zR<8Fi;k(Z5_Gb~>EdLZU@s6$YUnKjkOp~~FRl>V>)I+XkO^x zvo+(|xz?hEYw378NWqh5V-5&PxxZ@i{+A7ybb zOi(XuEne|JKVCJZ_Od3+LWO><-@<(K7wk#g-ns9rhx_ckJZnnAOl}2b&k8;I!amVC`s@T9%Qceucjt7uJXaK% zsx^jO&+Nuui`;((N;+6;Q$A zKYk`7@Ap` zm{^$_X&V?=85k(`EN(>6kei>9nO2EgL%>C8kPRAe8%i>BQ;SOya|>|mVLxK^2;@0W LS3j3^P6R^DL53jc$2_7Miu>u?ItWtdgSJSn^n2+pLi1F~s5uP3l%AwD4L(^Va;4+a20 z-3^Pz$+1Tsb0B4TJ_Uy8$pJ#Z;tl~o{7wK!Ne6&0@>0qi0K`H8;2jW?qp|MngjGEMQAb^|N|~xUb7G8(hIO-82+@ z$c@xPWy8wO1-|e(0p=RP>1F9mI01}XjzTI_X^_$WAveq52Tk2`&DQ1`vb?m`gR?+N zXbqc+CxLV)w@Nh(C~ghe$e0_3l8W;jJ0%)w0iJ^9($CUa*CA4JhF0A; zQQSv6dy)~O>h;2kkuzL_CH;QIxQ%tm>`5TQ0-gIDM=|b{LOFX z*!y+Pwaswxcf(aAtrmjv?XNYa^9hnGK_9V8y1Pch8;TA%?qhd*eGqQ6tPRn-oGoD# z@M^FwYw{7H{fRdgHW251Y&BE$MDI@P#1G-wlagg=&pe_cOBG%>@nFj4=u^U~WapUr zfcci}NWW&X(*2_zgB|?|DQ7Y^K_eN5xwB4`K(^OMXJ8@OLxEVRh8f>9=STeQ&m0;T zPuZ4?Y-I8)%bo1MUUV2O($8?tdDN7h5oE6ALC7u-y5Y~jH~309UWC+Q(SUt|)kria zrcIqx2<{O)V%^ORcf9|q`-_-nd~9?N#v+)M+P-VEPAj!QzHsI!>Q^71G!%Utw*-ZmwE zokd-pXn2)L?ziG-2uzdE`_p^ELZ(>`5~ZYVr_{g>59qOVsxWFv=60Uo&XV{Jp)x{^ ztJIZPb$B+vYD{r#VmUrrYg%!zRXq2;D@-=ajepsZ-0?DM3Kmd5o*7wOpcvg@9sBLzLcMzfKJCl9P@9e1ddEV^@QQiVNdQgRNJ0yLc$% z^9L@UWNyCI+C^iIFj!9Je3L9gY1c7=!Vi7J{~^(qRb(lxr2?R;R?gZ%!T3>52U3C& z1X8dZ0BfkVttE7irM1nGJurl=En=_rE+`ZMg&NVzQvV}}h&mm1Chq$J??HnDa)If; e8z^BB!DLEcMD+JHD&2^gZ@0T)JkfPXeA?d;n&EK( diff --git a/sprites/spr_dread_claw/layers/edc36065-c8cc-48b7-b999-6a9a9665befa/0a188212-4756-437d-9b06-5ec78990fa63.png b/sprites/spr_dread_claw/layers/edc36065-c8cc-48b7-b999-6a9a9665befa/0a188212-4756-437d-9b06-5ec78990fa63.png deleted file mode 100644 index 6fdaf272c3a763f8bf06604be5a801d1148415b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1693 zcmeAS@N?(olHy`uVBq!ia0vp^M}hbS2OE%#=TeXWQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^^Xu_C?62)bQm!@>w^5H?m?wWwQg*uFtih@7T9Bw${CFoZt*J zkVw!GCR58)lllLg&HreNL`j>woF7v|6hpYgVH;9IWaE>k@!u z;XDvo)CVGqYYbYNgssdZmP>Ix_Kvhrv0f_iS6$td)l%ixl=ZXrm#?;LX_~zH(Berq z^d+1Qs&B{#s(+$4-Mek?J8_>Hy=X<${z<2;I|F)FcjB;lfAQnB%M@n!_xE3WUvuf2m=mL{lVee88Tx$7mpJ-Q_u&#cn)$osASYjvCCI?Ydg{G6=n!CRaPcE-$0toVC( z*6%NW7?+2d7vGcWKQX&qDbLNzzTCwZ=x=?!^=J8islLzLvrnTgO<8u~1BcRweY#hA zuZO$tRg4t&itdpStI6~hytJ+6(pTM&t(~K_Ci3m!D}`m3cwJ6)Up&uX@-P0ru>e=ms$Yx! zR<8Fi;k(Z5_Gb~>EdLZU@s6$YUnKjkOp~~FRl>V>)I+XkO^x zvo+(|xz?hEYw378NWqh5V-5&PxxZ@i{+A7ybb zOi(XuEne|JKVCJZ_Od3+LWO><-@<(K7wk#g-ns9rhx_ckJZnnAOl}2b&k8;I!amVC`s@T9%Qceucjt7uJXaK% zsx^jO&+Nuui`;((N;+6;Q$A zKYk`7@Ap` zm{^$_X&V?=85k(`EN(>6kei>9nO2EgL%>C8kPRAe8%i>BQ;SOya|>|mVLxK^2;@0W LS3j3^P6":"", @@ -76,15 +74,9 @@ {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a74ce9f-a9b4-4216-a14f-8b9414602232","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"e51b6ab0-7a20-42e1-859c-46c98a0c8824","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c66f97c4-ce8b-427b-8ab0-baac7d95dda9","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5bbf0289-d424-4550-98ad-5047fc11962b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"edc36065-c8cc-48b7-b999-6a9a9665befa","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45d4f37f-74f6-48b1-bcf2-2712507cc7b1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75935d55-a225-48aa-b539-a41d7fac776a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"75935d55-a225-48aa-b539-a41d7fac776a","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_dread_heavy_bolter/9fa15ed7-cd79-4acd-83d9-95ecf0be332f.png b/sprites/spr_dread_heavy_bolter/9fa15ed7-cd79-4acd-83d9-95ecf0be332f.png deleted file mode 100644 index 369fc954b11c051639b78aa3d6850bf79eb28c8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2097 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 UGb)pc=I=Mgx_CK1#GI!68|X5-tN;K2 diff --git a/sprites/spr_dread_heavy_bolter/b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6.png b/sprites/spr_dread_heavy_bolter/b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6.png deleted file mode 100644 index e68b69e23c6770c09eb7258775a656b8ef2961a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2131 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 UGb)pc=I=Mgx_CK1#GI!68|X5-tN;K2 diff --git a/sprites/spr_dread_heavy_bolter/layers/b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6/8032ff11-29ed-4780-ac80-92b6e1c5e7aa.png b/sprites/spr_dread_heavy_bolter/layers/b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6/8032ff11-29ed-4780-ac80-92b6e1c5e7aa.png deleted file mode 100644 index e68b69e23c6770c09eb7258775a656b8ef2961a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2131 zcma)7c~sKd7XCG9;jPri({4FEwL&q&1~W9g5<*%cA`YOaIg~lztf@F;T536j+s5*!w@ z6SNlu0KiUfHW8Y$ie^s z{!aifPQ1(UanUMt!p~w*z{dAp%WbLx09~{P%8hXOy<)PHA`LXs`B*=K&7arXy1ARs zjvWlcdmBXRKlS^7^!n3NFtSqMhd?P=|8VsqX*?W}G?=EcF z`pz&)4CGB_S6rUkuJ!lV+LwJhxm)i3?2^>`5YZ;en*B_^M=O0jG^th(k2*hnUX?IW zV_x?WB09MT$$xz}7FM{~wy>ZcKKvR9apI)t4ZXWPvIm9tNN4ywXwqchou3Qj;L>7q z-QbYrz`LWJ(Hd0yl2cuMo?cx(sIE4n2|@arGH3cxLfA3n5jAjzABOEhL%~1Dz^>2r zK{^>Re0|U_PR-kP9Xvece-b_*{n|_|ZqlHv>Wc&Ij8x_uYYQU&>W`24&~Bs~G$0^A z-X6-$`n!SdDVpxiYq&(%b&}2QQ+e!BojHq8J0o?Rqi|;UX(a}QV2mschTj^lD7riw z^h5Bydgww7Yxg1^;(Q$=hO2_?FROHw@!5HexR<)%+S1n9o2EMr`U(du{ zmA9FWkLu-MgS1RBOo;ct(&NPk!1cwea+Pa3W%)PZtnBQrp)+n!X+a{Szl=GKSnu!M zKo4AqMo`tkqLA7AK;J}v*|R0dLLU9}n;~4->8VtDa<@`>ZaxNyN4HBGc?oF;WKN@{uAoJ6ZpyoYCZ;a?m(3?WiVoJIR|^c zoR4I1S-y?Q7ObhzkdS-d4o;v!w2|56>?@G(cE>*JQz#Uj%=khaET1mo$~YG8U6#t_ zExaN51#LEmWfRWeSP+dI5;7Fi#mb>{k;bq!A^o}Bq|nD44rvNohU<{TIZ7dX|EoUh zJW@_Iw#k7pGOn6^x>9284y&eOliCUkB0q%@nmlc;ykOfI-Ea>klP954d!rj=X@g3o zQp8k#TT}VpSOg>8tj3xN>P2{Hf9~WeZ{kV7>QUi%z*d_+sycZ#cV5rS7|F*<5yj97 z@UogJPahK_L|1SfzDc-?#O_69x8fz+uD3@a?MaBu^Y$sSMGzp^?JncsOU88{e~~>q z!Wfx;RjoZ{_vtb_ZF!~1ON&>wsOb*~NVkZ!U2|k{OC!48=RcV|-ojN}hY%uUe;r+r zdBIhP9L=NG4ZjZWJq>w#ksd`fyR|OrkL_)&$xistSE8o!c%k-pFuSkeIs&9({sVbA zxhC6dFTM07AzT>aF#9HR__w$q!il68B5qDAE9kvX)sAg8XoFi#=YnnvKWSb~X3dN} z-)ZvD8VWY~cbm-DPa@(*7=p5T+F!1$F3u<==B~LdlS3;dRUN_hl7lNFOSt1o8C-R(ug|LxSJ~$0(S5n?lIlZc(=EMi0uDXW`+k6B(MGu^i(8ZNsTRDc zq@0|s+kj!LAJ?)(ucdIlL_4RM*xm$N%keZt*0p$MVF7{c$!-;O#P_z%am+eL5BP=f z3^8PnZj(Y!kM6}-1{Lk27_ncy!#5${p~Zslfq(al04`?}Nf^jCBG zug@DbXa@M&t5lA;l&jx!exj}}J#m4jl8pA)I1zgrF$VkUkpr6~!$>!_{r-23?X4y& zY2|o`AqbylE9j;wEXI8H6Y)wCt!z_;m(@0b#!ldGpEU}ttNpp|EPJ@YTF77Vqn&cp zzQp2#G$om4T8gWTDW=Vb!k)Ig1`LBIgf3!+OuJ3Mj z^PJpq=#;lsvp>~6Fg5agY7{&oIZ7*lBd{aK4#AEdayUvj0)rpd4hJX<28Y3{9-JTh y10X&j^3sLOKL_Byyt||YK>qI`^-_FPO6vLe#6QPun_2Dt9":"", @@ -66,15 +64,19 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.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":"0e84c437-f0a8-4de3-a069-030fbbde3c3a","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cfd5cb7-7f48-45c5-a00f-8787ce85d23c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fa15ed7-cd79-4acd-83d9-95ecf0be332f","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"908060ba-7006-42e9-940d-3639378698fe","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d2fa763-d40a-4434-8aa5-af95172f89f6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d244aeeb-dbac-49cb-ba6a-cc8c95d420f4","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54b9f603-c68d-4b23-8069-73471fba2d1c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e84c437-f0a8-4de3-a069-030fbbde3c3a","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8cfd5cb7-7f48-45c5-a00f-8787ce85d23c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d244aeeb-dbac-49cb-ba6a-cc8c95d420f4","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"54b9f603-c68d-4b23-8069-73471fba2d1c","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_dread_iron_clad/eb254b9d-bb2c-41f8-9e62-ad9069c99560.png b/sprites/spr_dread_iron_clad/eb254b9d-bb2c-41f8-9e62-ad9069c99560.png deleted file mode 100644 index e39b6ca84c4173ffe4df0afc3d4f83264aa3fdfa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1539 zcmb7ESx}Q#82zgf8McaoB8wnp4@kn^XrV|V1d~`2P!UALu+>BsgGmq>4JZ&d2n`9v z6bqCkY(f+igNSUE3{Z=p5Dkk&fhZ}&Krp8C_oXv^(3##l_d93qnKS46?!(Rd0T-yR zW2yrHfId11i3hO{1o($6oDl9hcXS z>^DtPC!s|Be9zfPBHQp`Qh_HSTKD&H)ai@P7u~e5z1E_%pq}6>C-YbsUY&fs_WrU= zh29HSNx_Q95KQ~xIx4eh`^ubsJK*h;_jk$@9m0dCu_)Jt!J-~n`v|9*dS(`qEKF~r zyB>i0E!jCf4|cWo^`&pMEZwu4LRen-_=o#*7S(O-Ek6}c*Dqn|8WrBraRcDjM^(p;aix3;=-*LFS`mq_mF zu+No>9$X;Wl39RQKG+rF!6K0m8xZrEv1M3jSlG+^YwyIZIj5!vZM43gsvdF(_hORB zPsbwSkY~=p?n4Uh+}ZN3B^9H$;^ z;5J&}h?xzM`26|+>_c0vF&P5xthmXpTWJ1n6WSk|^Rwnm@f8+hw9Pky!pmhb>h&O5 zmQm{Wa|DfQZn(-!^Gh0Bu_{z_3?NI|xkGPKQc?`Py}dzb3W=B4RqC=Byn#0g2c~sH zV`KR=0_vf?q3#pefiO~Fve`4x4|guIoR zxTCh#@6Te!!L6l|f&I-K4hPy*CK8F*Nq-;q4Ir5cGK9PCeLzCRnUO1MO}h5T2)tE_ z@wZ<<5N7&|8TB4Ho`sKX;soLCSi3^DhRSms?U_j)S~rTGn?NrvA$5q7}sJg^k?v?kgQI~y-mxyMI;%ItVi4QTFTVD1u zMul{=e0)HTnFdxIBhSUSF7V6F=5lu(=HtwqWw{Y>aAd@g-4Ar3j$JmCpqnX zsHBq$$^<956-Xb$GGgMd*Do22tB%jnkQIxx8+`teV$7j1cJHf2o~TdUot@{^hml%1 zk5w{pQj6=I?QCjncx6dRNobL@mra$$?3G&d@g10V+uE1{fdGW@YG#A8h|PU%J08#! z%JTwq5KeL*IvC6D-<^P`Z`23rfl$ffEZCWRpjzGjigTyJPe>_bU)Xsx{S^;l}Uvq$AA51I5h3W{Y#ABf4{5v^OOT<9X`^gpM%m)m80bnvJ2+Rlx&yFIj?TtzaEX%xlx`~ z)8C{$*XvsJ@87FetL*kit=;C}>N=_5Kct{^P({ z`T6~d!4wA8IJdfV;Z{BlcIN0yCT_~VZ| zf_*-34Kkni(Bg&1#(%Hx?op|(s@i3$Yh`PD_g72bS;0lQXP&)w6ldS}>&konZxuG{ zmIt&~`O2-2ITcvGD}PDDd)1S6uEkNCWAu`@MqNE#wDXQt{e6#(`p2$xDy~pkRV66% zUw77Z?&psmKmHY=KjV7$v$KnH&%9;Yz3IZT$vVsY!^6WrzPr2o*T>J#&u>3xZvOt( z5r_Dbd7o$asC`wt{Y>r7v&UDnww5kk<Fl$sPMs|E` z2WhSM3ml)ynylE<+!AunkORt1*;u)~|CBYK=TljgC7=2nPbB>UQgeW++H~I4HqB9) zZ?|&KW5eCWuPaI$e})7z>Py2%UF(Yxj8jL}Xlc{xmVk_o?j86H1zLi$1OM z<$02p{xmjF zfw8Wkafp$jm63&&v9Y#+ft7*5RK>5IC>nC}Q!>*kacg)|<7*1kpaHj`Br`X)xFj*R W0JomanK`dOzVdYSb6Mw<&;$U%2fDie diff --git a/sprites/spr_dread_iron_clad/layers/eb254b9d-bb2c-41f8-9e62-ad9069c99560/750c31f7-7377-4a6c-809a-4f9444c3a1e7.png b/sprites/spr_dread_iron_clad/layers/eb254b9d-bb2c-41f8-9e62-ad9069c99560/750c31f7-7377-4a6c-809a-4f9444c3a1e7.png deleted file mode 100644 index e39b6ca84c4173ffe4df0afc3d4f83264aa3fdfa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1539 zcmb7ESx}Q#82zgf8McaoB8wnp4@kn^XrV|V1d~`2P!UALu+>BsgGmq>4JZ&d2n`9v z6bqCkY(f+igNSUE3{Z=p5Dkk&fhZ}&Krp8C_oXv^(3##l_d93qnKS46?!(Rd0T-yR zW2yrHfId11i3hO{1o($6oDl9hcXS z>^DtPC!s|Be9zfPBHQp`Qh_HSTKD&H)ai@P7u~e5z1E_%pq}6>C-YbsUY&fs_WrU= zh29HSNx_Q95KQ~xIx4eh`^ubsJK*h;_jk$@9m0dCu_)Jt!J-~n`v|9*dS(`qEKF~r zyB>i0E!jCf4|cWo^`&pMEZwu4LRen-_=o#*7S(O-Ek6}c*Dqn|8WrBraRcDjM^(p;aix3;=-*LFS`mq_mF zu+No>9$X;Wl39RQKG+rF!6K0m8xZrEv1M3jSlG+^YwyIZIj5!vZM43gsvdF(_hORB zPsbwSkY~=p?n4Uh+}ZN3B^9H$;^ z;5J&}h?xzM`26|+>_c0vF&P5xthmXpTWJ1n6WSk|^Rwnm@f8+hw9Pky!pmhb>h&O5 zmQm{Wa|DfQZn(-!^Gh0Bu_{z_3?NI|xkGPKQc?`Py}dzb3W=B4RqC=Byn#0g2c~sH zV`KR=0_vf?q3#pefiO~Fve`4x4|guIoR zxTCh#@6Te!!L6l|f&I-K4hPy*CK8F*Nq-;q4Ir5cGK9PCeLzCRnUO1MO}h5T2)tE_ z@wZ<<5N7&|8TB4Ho`sKX;soLCSi3^DhRSms?U_j)S~rTGn?NrvA$5q7}sJg^k?v?kgQI~y-mxyMI;%ItVi4QTFTVD1u zMul{=e0)HTnFdxIBhSUSF7V6F=5lu(=HtwqWw{Y>aAd@g-4Ar3j$JmCpqnX zsHBq$$^<956-Xb$GGgMd*Do22tB%jnkQIxx8+`teV$7j1cJHf2o~TdUot@{^hml%1 zk5w{pQj6=I?QCjncx6dRNobL@mra$$?3G&d@g10V+uE1{fdGW@YG#A8h|PU%J08#! z%JTwq5KeL*IvC6D-<^P`Z`23rfl$ffEZCWRp&T-Kr(75hW>!C8<`)MX5lF!N|bKMAyJr*U&h` z$k58j!phiK+rYrez+kH4*G?1-x%nxXX_dG&JgMjzGjigTyJPe>_bU)Xsx{S^;l}Uvq$AA51I5h3W{Y#ABf4{5v^OOT<9X`^gpM%m)m80bnvJ2+Rlx&yFIj?TtzaEX%xlx`~ z)8C{$*XvsJ@87FetL*kit=;C}>N=_5Kct{^P({ z`T6~d!4wA8IJdfV;Z{BlcIN0yCT_~VZ| zf_*-34Kkni(Bg&1#(%Hx?op|(s@i3$Yh`PD_g72bS;0lQXP&)w6ldS}>&konZxuG{ zmIt&~`O2-2ITcvGD}PDDd)1S6uEkNCWAu`@MqNE#wDXQt{e6#(`p2$xDy~pkRV66% zUw77Z?&psmKmHY=KjV7$v$KnH&%9;Yz3IZT$vVsY!^6WrzPr2o*T>J#&u>3xZvOt( z5r_Dbd7o$asC`wt{Y>r7v&UDnww5kk<Fl$sPMs|E` z2WhSM3ml)ynylE<+!AunkORt1*;u)~|CBYK=TljgC7=2nPbB>UQgeW++H~I4HqB9) zZ?|&KW5eCWuPaI$e})7z>Py2%UF(Yxj8jL}Xlc{xmVk_o?j86H1zLi$1OM z<$02p{xmjF zfw8Wkafp$jm63&&v9Y#+ft7*5RK>5IC>nC}Q!>*kacg)|<7*1kpaHj`Br`X)xFj*R W0JomanK`dOzVdYSb6Mw<&;$U%2fDie diff --git a/sprites/spr_dread_iron_clad/layers/f5bd9088-45e5-4695-a241-41e7835f44fd/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_iron_clad/layers/f5bd9088-45e5-4695-a241-41e7835f44fd/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index 5bda11e0382796382bfd8170fc6fb6d95416a465..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^M}hbS2OE%#=TeXWQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^&T-Kr(75hW>!C8<`)MX5lF!N|bKMAyJr*U&h` z$k58j!phiK+rYrez+kH4*G?1-x%nxXX_dG&JgM":"", @@ -77,15 +75,9 @@ {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"659ee02b-897e-4104-b145-c359f7650d83","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"72055c78-d5f9-4d35-b4fc-ac4f508fc051","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5bd9088-45e5-4695-a241-41e7835f44fd","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"311b9778-22a9-486c-8c7a-3869c6e64ad1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb254b9d-bb2c-41f8-9e62-ad9069c99560","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21ebe3ac-2d0b-4143-a037-736b0c94f029","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"adc99ac7-ddb8-4694-8730-7920aea8ffb2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"adc99ac7-ddb8-4694-8730-7920aea8ffb2","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_dread_lascannon/48994d0c-01f0-441c-9383-c0eafe9cae39.png b/sprites/spr_dread_lascannon/48994d0c-01f0-441c-9383-c0eafe9cae39.png deleted file mode 100644 index 936b86fe3e8b21cd86d50dd1963414351e58229f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1774 zcma)7c~sKr8vf}FWP~OR$FR)psu!Cy&}0g|I!OA)sk7Z9bi5k?DfxuA}wK&dIEEdoG18UW-} z0Kk<3z>(Mo&wQOU7hsx~I|11L91pvMMF0Sr^(46ZCr+)%Fa=T%1MrOSBW<=S#^8$| z8Y>27KvoWtH^$!zNsqkFi+(PAa!2n;8NkD{BLtrPAAtfW)6|dVg{Uxp|Dk$81@xwS z3?QEO)aPto%+YB5sg(w9YB)S|?mcC(!|rZRJ{Jf=sjlFS7gujK90nT8&Y{4~@YqW0 zc%E(hZw_#CWmzmr9*#QJI&2%0!S>T3dQH~m3ALi8z>{ToRFyBtZRj~8(j+Ruh&nPi z$xF?7r~bGm!J+-PNGx>j{@xM~2K)HVM2&!ghm3OSZTr*;-~-75R+OcjUz1wg7;eIU*pU~+6D?wgaou1U9ZGb!?NTrz zk44qT(O6}8GyQ+wwnS*V9=(LuijLID3{3a$*US9&_RCVfz7DzkS0|$M#sg|xaKwfE zFs{`RV%*jgv#sJq0-fdtCAO(7%3s9Fkp+smg}m+1vQmuqJ;i{F&CLK1?P*BZ+l|@T z*>#Rdf#TJ|K~QDqr);vVLGJ4q?C4fdmo>D0TplyBnaoWL%d9?&#JeU8e3uh($QLAl z^szhsCRM4`&gKQPiHV8&5b&{i`PgKIQTfQI5=m?M?)VE5=%J|lF~rRm(IBmy{$6XR z7)I~=%b)-?xS1U4MtCY?4y~|*-3VuSBO}H_)z6blji?;O?uO-!)&8nc_0=A>UzgPX zX-`k#4rh8>w8Kf6NI!Xh=$FU&)9^hD9q~znTyarQ9n&w^^h5xf0D>u8es^;8X_?*e*KgpJQ!8v=1d+45jTwApVcPeTE-_%E`4p&!<4}9T zAyu`-;B2plFZX?Lyp2V~hpvug1$&ZJUnc2*9+VP(uN^AYW?IrwVLd6wVLpAa(U|6| zJON5?EyIkQWj=TD!1x5*Us@OYRwm2mzUCYtXU%OajKD^@nC9d&)EXAuI3U}durHSU z=8PfKl?cKDQy8u@*Pg~y?qrF`ndWoYTz-qJNz2gTWFY(EljW>jex_KmXgR)8(-sQV zReHudUKP`#@~marL+Do6fvJ*qGoc0OM{QT*gZQ}a=XQD4uBgGj&UCTlS5sG%d0jLp zmw%`C7XS4=X-Fn3ytx2t3xN)Ej_+BV&~Y+;xo(oatE4#Xg;XcuJdrteQ$ikR6IUsZzNYxmmF8P-+ptXGG=c!%Fo|32F|){(IG z65E}+uU_A6_rI)M`!eHRu2{gpsh)JTnn3Sz&%`bon{FFe!5}uE zQ_*m~guH(Dk$%o4!oB<8aXGKOrS{)`PX8zisPBDzey?2pzU3Rfu(lboPP?J)%{d&J z-vp}qQ*Y@1X-Z@7AGiV+0K#RgkEYF%MZCz03}?}C5!dJ%0PN6qr)|&}8#{Y{3>Ig9 z8izUaH5!dWqfz+_t^Y${{16#^Iq8oHmn4+WzZB}f3an@b{W>e05&Op+J#otT=ixnx K-UJbzn*JY0N&^D` diff --git a/sprites/spr_dread_lascannon/fc539d0b-b559-4265-95a9-df8bac65ea2b.png b/sprites/spr_dread_lascannon/fc539d0b-b559-4265-95a9-df8bac65ea2b.png deleted file mode 100644 index e0a62c0c9e742b905406edd10cd91b4849486884..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1786 zcma)7eKea{8h^_$_8pDQky&9-oI$GC#Ahd?oQkwmt5Kq~YJw(31(BdgS`D%$vBnx@ zS|({I8ebjX8WUYRzS`8%qN$HmrcOmtsqGAcw6SmZk3DDqm_2jvx%YR@?>@i#Jm)#j zeeTzUu;cqdD-ZyH{UO0YXCNGb)~bmyw0{NKAtA6!3_f!T0P>swpr8l32W|)bwd*k zw=T+fMVoQBe#`{&^gD*4*kx1?FlB1bGMhFkXoPDP)Nm7&_V;QqdQ_~ZP~kHBrCIKK z^i}}Bx_&)2sj})?0Ri1lL8{AG_{qVJ!z>5hjDq*<*`kboa;tUq;CQ2D>B_q77;3z^ zq$J?#JIAXJc6_-H_HsRtn|otS*7#2<^Eod=IQ*?%DQM5EJBb>1F?uPJ-7E8V(msD_ zRrp9-AErDq@pf1zxW+9hS<=6|tlYu1`72HP2c}7mWYiCqv$E{Z?#nY6O=Arq+n86_z@1u z&Su_`@lq(oF*vtyjpjBB$)XEz-5f^V*F?J6GcyG7!>m(<9j1rQdK=I*z?b#RFqB^2o zvkj(ZVlB@ja>G)K*x`$di^CcXRjC*dH8-QA9=!`x=FTsU(o5#xFP|FOv6EU zJV{++JsoUrP8g7nwwxVXqHJ43;h343Ie&@^t)?EZwe4j33+-CEw+_DSPe@XEC$rNf zab|-vI23Y3^ofB5ZzK#&YM%GLsqS>mzZ}rh*M94?=uL!awDu328B1;`0>{%6YHduv z&ACW_n2^L`+S~{cM`F6&2g@GuqG~rb-WIVRs&}yJIVgcKpev4NAZ7Zx6HQNDCp)cI zj7)KAMV?bmyzJ{TI#1Z3&HHs_V#ES;;f$7Nr+qZ{W6oBAFFVq{yrtKIJCoRb_K_`J zs$dK#HvFl9LkI@P;l1?}$ws}XCFhS|W2-M>LJ4altHn2eB%sO1i(fwURUM{`*GLCG zm#(S}7ewwIC!$Udm6xdx!g>@DW%nab$Me}oZKkn;X*TbY23rO_#B4*&8iKDr7`BvU zn+RrNbuja4@jnTqh?XhB+BqSl4Ty<$h_R?Z|A<0X0H-<*ixx6Nx5t10J zPxmqxH#&H^;3%PK;EvP!3&}$MlfRf9xb+~V1?o^c%sAfzy53QJ>f;Es7%Dn}KWjc; zuUY7;XF?v6;9wGMcQ|RjP-EB$>nvusWDL(XLDlkPa}(*j@wtT~qBKnsm$QXPly?N9 zkl*tS&b7BSp|k#pRIi8|ovp5I`K0jK;jzmN&%^gne|}+}_3>y!Q^B8v1ywDo&MP!A zSYh}(I_m#7Is0>f^SK|8SLkCf$k362k7itqXOOXpnPdn6544Au8ye&0;TehX!FqaO zF^3PK(O5JZ^;c!@{|Kn*7n3Quzb%NF`s%}vh5D}tMlzL5XT(!8ep>?@xjOqH{1ALt JPK&dIEEdoG18UW-} z0Kk<3z>(Mo&wQOU7hsx~I|11L91pvMMF0Sr^(46ZCr+)%Fa=T%1MrOSBW<=S#^8$| z8Y>27KvoWtH^$!zNsqkFi+(PAa!2n;8NkD{BLtrPAAtfW)6|dVg{Uxp|Dk$81@xwS z3?QEO)aPto%+YB5sg(w9YB)S|?mcC(!|rZRJ{Jf=sjlFS7gujK90nT8&Y{4~@YqW0 zc%E(hZw_#CWmzmr9*#QJI&2%0!S>T3dQH~m3ALi8z>{ToRFyBtZRj~8(j+Ruh&nPi z$xF?7r~bGm!J+-PNGx>j{@xM~2K)HVM2&!ghm3OSZTr*;-~-75R+OcjUz1wg7;eIU*pU~+6D?wgaou1U9ZGb!?NTrz zk44qT(O6}8GyQ+wwnS*V9=(LuijLID3{3a$*US9&_RCVfz7DzkS0|$M#sg|xaKwfE zFs{`RV%*jgv#sJq0-fdtCAO(7%3s9Fkp+smg}m+1vQmuqJ;i{F&CLK1?P*BZ+l|@T z*>#Rdf#TJ|K~QDqr);vVLGJ4q?C4fdmo>D0TplyBnaoWL%d9?&#JeU8e3uh($QLAl z^szhsCRM4`&gKQPiHV8&5b&{i`PgKIQTfQI5=m?M?)VE5=%J|lF~rRm(IBmy{$6XR z7)I~=%b)-?xS1U4MtCY?4y~|*-3VuSBO}H_)z6blji?;O?uO-!)&8nc_0=A>UzgPX zX-`k#4rh8>w8Kf6NI!Xh=$FU&)9^hD9q~znTyarQ9n&w^^h5xf0D>u8es^;8X_?*e*KgpJQ!8v=1d+45jTwApVcPeTE-_%E`4p&!<4}9T zAyu`-;B2plFZX?Lyp2V~hpvug1$&ZJUnc2*9+VP(uN^AYW?IrwVLd6wVLpAa(U|6| zJON5?EyIkQWj=TD!1x5*Us@OYRwm2mzUCYtXU%OajKD^@nC9d&)EXAuI3U}durHSU z=8PfKl?cKDQy8u@*Pg~y?qrF`ndWoYTz-qJNz2gTWFY(EljW>jex_KmXgR)8(-sQV zReHudUKP`#@~marL+Do6fvJ*qGoc0OM{QT*gZQ}a=XQD4uBgGj&UCTlS5sG%d0jLp zmw%`C7XS4=X-Fn3ytx2t3xN)Ej_+BV&~Y+;xo(oatE4#Xg;XcuJdrteQ$ikR6IUsZzNYxmmF8P-+ptXGG=c!%Fo|32F|){(IG z65E}+uU_A6_rI)M`!eHRu2{gpsh)JTnn3Sz&%`bon{FFe!5}uE zQ_*m~guH(Dk$%o4!oB<8aXGKOrS{)`PX8zisPBDzey?2pzU3Rfu(lboPP?J)%{d&J z-vp}qQ*Y@1X-Z@7AGiV+0K#RgkEYF%MZCz03}?}C5!dJ%0PN6qr)|&}8#{Y{3>Ig9 z8izUaH5!dWqfz+_t^Y${{16#^Iq8oHmn4+WzZB}f3an@b{W>e05&Op+J#otT=ixnx K-UJbzn*JY0N&^D` diff --git a/sprites/spr_dread_lascannon/layers/48994d0c-01f0-441c-9383-c0eafe9cae39/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_lascannon/layers/48994d0c-01f0-441c-9383-c0eafe9cae39/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index 70e38130552e845c720f621b51374549a7c7acc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^M}hbS2OE%#=TeXWQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^&T-Kr(75hW>!C8<`)MX5lF!N|bKMAyJj*T^`; z(9Fu%#LCb@+rYrez(Aw-`8E^{x%nxXX_dG&L|%voMTQ34hLX(O)Z&uF+ydNs_>R_H P1%;-ktDnm{r-UW|+4N7S diff --git a/sprites/spr_dread_lascannon/layers/fc539d0b-b559-4265-95a9-df8bac65ea2b/1d4cccd9-bb49-4325-8933-45f465f70841.png b/sprites/spr_dread_lascannon/layers/fc539d0b-b559-4265-95a9-df8bac65ea2b/1d4cccd9-bb49-4325-8933-45f465f70841.png deleted file mode 100644 index e0a62c0c9e742b905406edd10cd91b4849486884..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1786 zcma)7eKea{8h^_$_8pDQky&9-oI$GC#Ahd?oQkwmt5Kq~YJw(31(BdgS`D%$vBnx@ zS|({I8ebjX8WUYRzS`8%qN$HmrcOmtsqGAcw6SmZk3DDqm_2jvx%YR@?>@i#Jm)#j zeeTzUu;cqdD-ZyH{UO0YXCNGb)~bmyw0{NKAtA6!3_f!T0P>swpr8l32W|)bwd*k zw=T+fMVoQBe#`{&^gD*4*kx1?FlB1bGMhFkXoPDP)Nm7&_V;QqdQ_~ZP~kHBrCIKK z^i}}Bx_&)2sj})?0Ri1lL8{AG_{qVJ!z>5hjDq*<*`kboa;tUq;CQ2D>B_q77;3z^ zq$J?#JIAXJc6_-H_HsRtn|otS*7#2<^Eod=IQ*?%DQM5EJBb>1F?uPJ-7E8V(msD_ zRrp9-AErDq@pf1zxW+9hS<=6|tlYu1`72HP2c}7mWYiCqv$E{Z?#nY6O=Arq+n86_z@1u z&Su_`@lq(oF*vtyjpjBB$)XEz-5f^V*F?J6GcyG7!>m(<9j1rQdK=I*z?b#RFqB^2o zvkj(ZVlB@ja>G)K*x`$di^CcXRjC*dH8-QA9=!`x=FTsU(o5#xFP|FOv6EU zJV{++JsoUrP8g7nwwxVXqHJ43;h343Ie&@^t)?EZwe4j33+-CEw+_DSPe@XEC$rNf zab|-vI23Y3^ofB5ZzK#&YM%GLsqS>mzZ}rh*M94?=uL!awDu328B1;`0>{%6YHduv z&ACW_n2^L`+S~{cM`F6&2g@GuqG~rb-WIVRs&}yJIVgcKpev4NAZ7Zx6HQNDCp)cI zj7)KAMV?bmyzJ{TI#1Z3&HHs_V#ES;;f$7Nr+qZ{W6oBAFFVq{yrtKIJCoRb_K_`J zs$dK#HvFl9LkI@P;l1?}$ws}XCFhS|W2-M>LJ4altHn2eB%sO1i(fwURUM{`*GLCG zm#(S}7ewwIC!$Udm6xdx!g>@DW%nab$Me}oZKkn;X*TbY23rO_#B4*&8iKDr7`BvU zn+RrNbuja4@jnTqh?XhB+BqSl4Ty<$h_R?Z|A<0X0H-<*ixx6Nx5t10J zPxmqxH#&H^;3%PK;EvP!3&}$MlfRf9xb+~V1?o^c%sAfzy53QJ>f;Es7%Dn}KWjc; zuUY7;XF?v6;9wGMcQ|RjP-EB$>nvusWDL(XLDlkPa}(*j@wtT~qBKnsm$QXPly?N9 zkl*tS&b7BSp|k#pRIi8|ovp5I`K0jK;jzmN&%^gne|}+}_3>y!Q^B8v1ywDo&MP!A zSYh}(I_m#7Is0>f^SK|8SLkCf$k362k7itqXOOXpnPdn6544Au8ye&0;TehX!FqaO zF^3PK(O5JZ^;c!@{|Kn*7n3Quzb%NF`s%}vh5D}tMlzL5XT(!8ep>?@xjOqH{1ALt JP&T-Kr(75hW>!C8<`)MX5lF!N|bKMAyJj*T^`; z(9Fu%#LCb@+rYrez(Aw-`8E^{x%nxXX_dG&L|%voMTQ34hLX(O)Z&uF+ydNs_>R_H P1%;-ktDnm{r-UW|+4N7S diff --git a/sprites/spr_dread_lascannon/spr_dread_lascannon.yy b/sprites/spr_dread_lascannon/spr_dread_lascannon.yy index f070a4d9a2..f0dc36e09c 100644 --- a/sprites/spr_dread_lascannon/spr_dread_lascannon.yy +++ b/sprites/spr_dread_lascannon/spr_dread_lascannon.yy @@ -13,8 +13,6 @@ "For3D":false, "frames":[ {"$GMSpriteFrame":"v1","%Name":"7a4dd223-f227-41f5-b68a-f206094e2789","name":"7a4dd223-f227-41f5-b68a-f206094e2789","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"48994d0c-01f0-441c-9383-c0eafe9cae39","name":"48994d0c-01f0-441c-9383-c0eafe9cae39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"fc539d0b-b559-4265-95a9-df8bac65ea2b","name":"fc539d0b-b559-4265-95a9-df8bac65ea2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"243e4946-be2b-4339-b336-5253d6514685","name":"243e4946-be2b-4339-b336-5253d6514685","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, @@ -53,7 +51,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":4.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -67,15 +65,19 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.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":"7a4dd223-f227-41f5-b68a-f206094e2789","path":"sprites/spr_dread_lascannon/spr_dread_lascannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c67a973-13fd-4cc5-9173-7d7899f31e93","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48994d0c-01f0-441c-9383-c0eafe9cae39","path":"sprites/spr_dread_lascannon/spr_dread_lascannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"07736577-6138-4e0a-8b8c-d34946402720","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc539d0b-b559-4265-95a9-df8bac65ea2b","path":"sprites/spr_dread_lascannon/spr_dread_lascannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c4264f38-ca9a-4c52-a7c2-46e73fb40e5d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"243e4946-be2b-4339-b336-5253d6514685","path":"sprites/spr_dread_lascannon/spr_dread_lascannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"79b47047-c38c-4291-9d1d-bcd6d2aa31ac","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a4dd223-f227-41f5-b68a-f206094e2789","path":"sprites/spr_dread_lascannon/spr_dread_lascannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4c67a973-13fd-4cc5-9173-7d7899f31e93","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"243e4946-be2b-4339-b336-5253d6514685","path":"sprites/spr_dread_lascannon/spr_dread_lascannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"79b47047-c38c-4291-9d1d-bcd6d2aa31ac","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_dread_missile/098fd89a-d321-4251-b0f3-70132fea3997.png b/sprites/spr_dread_missile/098fd89a-d321-4251-b0f3-70132fea3997.png deleted file mode 100644 index 85c907add0f31edb373893597a91c38c93f7a664..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1487 zcmeAS@N?(olHy`uVBq!ia0vp^M}hbS2OE%#=TeXWQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^ zOnvEp+I!cp7Z*&au6q-EUpPoxIgV-3r|;ME-=CH6 zeEl~6@t@uY1)N-)G#-e`aLJPsVnD-FFI-%{?PlEW z@5;djo~e%uUpx>N@ws=QSfZ)vq*v*~1q%``1(ob6-Qt}SrX6s}3$H{JXv_Oh@>intp7FbrQEI_bTZ#));2Gs{`M?-w~=UaqkE+xqJ3>uc{9 zX-Z5|o!T3nD&`s({^n^>r1-9V`}#W0`dnCk=k43vHP>Hf-0v&??QOx6`g4zKat9{wjM$Mn= zEjNbwZhLF&xPA4R8awk!cHh@ut!{2)WnFn@wtm~ZoZ07}%iDXfFZN%usrbvv^DK9x zQ+@6kn&$JJ{5E&NYpu(MD!ZRPtuvV~;X9vmm#zB8G{Xb@dle%$ZT`e3CA5Bzbc#pV z{HBmiK-Q|oyelIr+3mT3{*0(R9uir}t{ZmGQC>6r98XIVS?UeP*rZuxf|Ni)~R<0#>gnsp z-)-BUTwi3wx;P`P%j;^)Ek$qn2>02BKt(3AyzG$%mMPV%(_plySUtNzevy8JDcVyRm+Ns$jnNc?Ddz0 zQ29WTe8ZoA>~YP@f(|(^^a5&BEpd$~Nl7e8wMs5Z1yT$~21X{j2FALE#vw+AR)$7a zM&{ZE237_J$}H+NoHB5IcK$y5k=U`R1wH zwD;@r%V><*n7wZ0 zUp9r=ISVCZ>WcEi+}n=7_nmJMckQKXuwCt~H>YknS!e(E(0T3nS!nsMHMOcU&#<4G zcJa{-ZErW;Q>oFxYou)Un`Ey&aQd`NSI1(pdj+%JEbPc=PMq?<=9d7M#cI2jMGrpd zl&F7h+51{0<(+nC%5KGim5(nv%4uA0ex+ojvqWs6{EsYHry-^XH!{-{xHm)^yr<_LbvaeUqhc7lfQL zJ^C!N?t0|@EwVC??o3ae_540xl7-B%_cQ!5ewEuiN*CW3?J}fT#zyF=G z$;tII{g(He+nVu=r7#C|hsk2GI<>(L#X4&4hj-0)Za|Fw4(eo5-@khG z>gN6xcin#}`_5goBqKcPMs?O|zk?5h?x^mrys+MC?FMxbnRjf$W^vy zOP74%=HF)h9hb}RNorbLyV+eHxMBOjbJkg28!v48+&6#b-0~&U7x^*HT*A>hw>)K1 zl5gU3*_lhYU0ddsUn%|eDE4G(u=V>DFYo-;oOSj0oNXTqXI`0>v~cf|40pD@w<^m$ ztS!R2CMNA{Eis#Y^!E1r+s8j0h-XVQ75IJYpk`1DlaV0TjR|R!1H)Z+e=U0@BBOV; zu1l}0Oi=Lp_3LlHfB*i!C7_@qZdJ&c#@tn#QRMyGYq=0^-b~Hx#|B;rhF3Um)~eF*FSx0-{ukT7`}%)< z`XDN{;QLcsW`ZRONeaGPthf9+$J(RgsW?!dYKdz^NlIc#s#S7PDv)9@GB7gHH89pS zG!8K`v@)`=GB(yWFt9Q(n5y`-6GcOAeoAIqC2kE*YJ5$B8Z_WGlw{_n7MCRE7U0&i SIWy-K$Tyy@elF{r5}E))Rhw4; diff --git a/sprites/spr_dread_missile/layers/098fd89a-d321-4251-b0f3-70132fea3997/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_missile/layers/098fd89a-d321-4251-b0f3-70132fea3997/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index 8833551f742db70e6c3578331b92930dd8519f3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^M}hbS2OE%#=TeXWQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^&T-Kr(75hW>!C8<`)MX5lF!N|bKMAyJr*U&h` z$k58r$jZoE+rYrez(AQr{S1nR-29Zxv`X9>f+FV^05xd9Z79jiO)V}-%q_sJht+4_ QdQfP3y85}Sb4q9e07@TD8vp zOnvEp+I!cp7Z*&au6q-EUpPoxIgV-3r|;ME-=CH6 zeEl~6@t@uY1)N-)G#-e`aLJPsVnD-FFI-%{?PlEW z@5;djo~e%uUpx>N@ws=QSfZ)vq*v*~1q%``1(ob6-Qt}SrX6s}3$H{JXv_Oh@>intp7FbrQEI_bTZ#));2Gs{`M?-w~=UaqkE+xqJ3>uc{9 zX-Z5|o!T3nD&`s({^n^>r1-9V`}#W0`dnCk=k43vHP>Hf-0v&??QOx6`g4zKat9{wjM$Mn= zEjNbwZhLF&xPA4R8awk!cHh@ut!{2)WnFn@wtm~ZoZ07}%iDXfFZN%usrbvv^DK9x zQ+@6kn&$JJ{5E&NYpu(MD!ZRPtuvV~;X9vmm#zB8G{Xb@dle%$ZT`e3CA5Bzbc#pV z{HBmiK-Q|oyelIr+3mT3{*0(R9uir}t{ZmGQC>6r98XIVS?UeP*rZuxf|Ni)~R<0#>gnsp z-)-BUTwi3wx;P`P%j;^)Ek$qn2>02BKt(3AyzG$%mMPV%(_plySUtNzevy8JDcVyRm+Ns$jnNc?Ddz0 zQ29WTe8ZoA>~YP@f(|(^^a5&BEpd$~Nl7e8wMs5Z1yT$~21X{j2FALE#vw+AR)$7a zM&{ZE237_J$}H+NoH&T-Kr(75hW>!C8<`)MX5lF!N|bKMAyJr*U&h` z$k58j!phiK+rYrez+kH4*G?1-x%nxXX_dG&JgMB5IcK$y5k=U`R1wH zwD;@r%V><*n7wZ0 zUp9r=ISVCZ>WcEi+}n=7_nmJMckQKXuwCt~H>YknS!e(E(0T3nS!nsMHMOcU&#<4G zcJa{-ZErW;Q>oFxYou)Un`Ey&aQd`NSI1(pdj+%JEbPc=PMq?<=9d7M#cI2jMGrpd zl&F7h+51{0<(+nC%5KGim5(nv%4uA0ex+ojvqWs6{EsYHry-^XH!{-{xHm)^yr<_LbvaeUqhc7lfQL zJ^C!N?t0|@EwVC??o3ae_540xl7-B%_cQ!5ewEuiN*CW3?J}fT#zyF=G z$;tII{g(He+nVu=r7#C|hsk2GI<>(L#X4&4hj-0)Za|Fw4(eo5-@khG z>gN6xcin#}`_5goBqKcPMs?O|zk?5h?x^mrys+MC?FMxbnRjf$W^vy zOP74%=HF)h9hb}RNorbLyV+eHxMBOjbJkg28!v48+&6#b-0~&U7x^*HT*A>hw>)K1 zl5gU3*_lhYU0ddsUn%|eDE4G(u=V>DFYo-;oOSj0oNXTqXI`0>v~cf|40pD@w<^m$ ztS!R2CMNA{Eis#Y^!E1r+s8j0h-XVQ75IJYpk`1DlaV0TjR|R!1H)Z+e=U0@BBOV; zu1l}0Oi=Lp_3LlHfB*i!C7_@qZdJ&c#@tn#QRMyGYq=0^-b~Hx#|B;rhF3Um)~eF*FSx0-{ukT7`}%)< z`XDN{;QLcsW`ZRONeaGPthf9+$J(RgsW?!dYKdz^NlIc#s#S7PDv)9@GB7gHH89pS zG!8K`v@)`=GB(yWFt9Q(n5y`-6GcOAeoAIqC2kE*YJ5$B8Z_WGlw{_n7MCRE7U0&i SIWy-K$Tyy@elF{r5}E))Rhw4; diff --git a/sprites/spr_dread_missile/spr_dread_missile.yy b/sprites/spr_dread_missile/spr_dread_missile.yy index c3560a211f..a9d95edff0 100644 --- a/sprites/spr_dread_missile/spr_dread_missile.yy +++ b/sprites/spr_dread_missile/spr_dread_missile.yy @@ -13,8 +13,6 @@ "For3D":false, "frames":[ {"$GMSpriteFrame":"v1","%Name":"737d52a6-df9c-4e48-8622-c0b852027c2f","name":"737d52a6-df9c-4e48-8622-c0b852027c2f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"7fa6bc12-162e-4538-92df-3bc73caec0ee","name":"7fa6bc12-162e-4538-92df-3bc73caec0ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"098fd89a-d321-4251-b0f3-70132fea3997","name":"098fd89a-d321-4251-b0f3-70132fea3997","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"b88af3eb-d9a5-46d6-aae2-0ca08fd69c1c","name":"b88af3eb-d9a5-46d6-aae2-0ca08fd69c1c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, @@ -53,7 +51,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":4.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -67,15 +65,19 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.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":"737d52a6-df9c-4e48-8622-c0b852027c2f","path":"sprites/spr_dread_missile/spr_dread_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"91868ede-eed2-47ff-a436-f5de3e22a7b1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fa6bc12-162e-4538-92df-3bc73caec0ee","path":"sprites/spr_dread_missile/spr_dread_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1b75f6f-5c00-4e75-9ad1-3dd22e2756af","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"098fd89a-d321-4251-b0f3-70132fea3997","path":"sprites/spr_dread_missile/spr_dread_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41ff1a87-5f14-4f20-bf2a-9faa2e5e734e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b88af3eb-d9a5-46d6-aae2-0ca08fd69c1c","path":"sprites/spr_dread_missile/spr_dread_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"76bea7ed-ee53-46d6-a834-7d3967e4c4ce","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"737d52a6-df9c-4e48-8622-c0b852027c2f","path":"sprites/spr_dread_missile/spr_dread_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"91868ede-eed2-47ff-a436-f5de3e22a7b1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b88af3eb-d9a5-46d6-aae2-0ca08fd69c1c","path":"sprites/spr_dread_missile/spr_dread_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"76bea7ed-ee53-46d6-a834-7d3967e4c4ce","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_dread_plasma_cannon/76458a7c-df41-4efe-ac58-2273c4d3e898.png b/sprites/spr_dread_plasma_cannon/76458a7c-df41-4efe-ac58-2273c4d3e898.png deleted file mode 100644 index abfda678323e4799ded4299796c0a4a9f82b23ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1973 zcma)7c{Cf?8qd5=RD;rKER#-E(?_L**fl&PM<|&{YTqK(nVQ%|#1dLdZG%obwyLE{ zl3GV-Xh_u|)yfPiB^AmH&roY?Em2`P5I7Xg4c1OTw)4*(!b z0RYvg2i)tHQin_+*4`FybUdqh%zIJ;%fS}qN)xZXvnHPlRX_QmYG-zCRQ58acx6p_ zS*sQsou7A;oAd=bj{8mRS7BXzFqR8+yOjj=knOp-`Xy|XAs6a8fau*OVi zO-eQ0Pup=G+0cMSf%Y(VFDJJOx$?IsF5jKlek{_G5&Oy!PjfTV$d4NQWq~3`)m|kK zO9^xr(*Iel|FiqB!#nR%I+T-d>i^t1QAu8Ok=;i?cBm zW=gh9MOHKy53^tRf2(z`baR>Tu5Mq@ z$7^2;&;*~HNjZnFwDhvlyRy%)0oy%#?O2w*?ce^d6Pn=KU*!2B5?vWzWkpnHk58ApTw+zlLK`lt#GoYsKf!PkLhlj3My8 zsKoumRa$hIF=UL|#t^=LackFY(ds93H{&nEIobw2cJ9qz@NJ1G{OHgsc;H9+EuwU z8>@4@T`4Ikes*Q0#M~mOCuVZ8>#U;sffAG15@ep-Zm2dhGlPf72Z5;1HHL;#ysX5N zT}fqm?VOsXI{)tv_Ltw+37oXu;`8`{S7|Ad9m#xk;x^T6XlPoW86t3DXMR6ishO0IM#Tulu7CA>f`q?L+F-KPd zC60OUXZn#q2OjO?tT)jNt?i#rxZ_&Css`&wP;(jS;znbtf)pNBd*Fm@Vw0cfH68jG zcOma-XvJ*zZeS#L&FvJB$CAjiX5Bk~&jPpagqopI&XZxAdZr+i4xC&fPP9#RW!>0Z zWubeYjPG17u$Nx$)`>7`glfGwMEoZX!}q+z7d;YdVnG5TTk(R`k7kk6Z)E1!UBPX- zd3}9-wCyFgyF|A1G1W!d=bKwvc1IyN3br3D(AsaKbx2}14#A-}L$YW0FM?M(#Vxy6 zu2A~+mbA=&_$gM%sCiTJFYN_ONn~(^Yw#2u8$ezYSfuU2~8;hk*>?&x7*fx32Kx z$B9LRk@E1vCnOEyCU}G#kOwIo$R8*uDBwIB3O3ByOP+Q_gvtKf?nZ1$<1JGdm{)mZ z-(OXaSJ4yF#e^3&YrRZB_wL>{?yJJ^4W*g*mRU{w|mJT zW%QjY2x+EX*wOs14nZ+JG#O!#6ATo(=6@zH#JOToE%(P^rcI<;MqM>|k7nr?s;O?B z(oG!|l;{f-$6O-XlP%R3<|PcD_cUgs%SgjV+BfUdJfEb)X{xpE3!wMiajDQqB(gpnwhyw+AdDEnfvzio*nqtU&GYkg+=A<& z-x4zpgzRW=Y2_US9{!@YUv{HH=xmcou;DwI_#6bhp^qE>oyPzFVr)`VP9!M$q9x2M zuryASg7KsT2T($gK`|jx02m?+jo}C*xPg(YAp&V)f<&0>AP`6dLT&#K>9_blgz(7V s(C-rdnh?tLx-TVY|2G3AG(04h5)dBs*BmQ04Rc(*1IEd=8SS6;A4(i>A^-pY diff --git a/sprites/spr_dread_plasma_cannon/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3.png b/sprites/spr_dread_plasma_cannon/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3.png deleted file mode 100644 index ef4e22db81abea496cfc48ef3956f88aafbad0cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1958 zcma)7c{tnI8vYrjt)ipN#Zcv{B|4T=%cvq~B8Vl{+9_h+Yiy}%wIp(HXlX7=MUv7{ z%fv2fsiKOpT}vxMu271gWJHPOruUEg+<)dibIxsh)@PxAlV4Fd`GutIij%JmPZ#bhiw$7X zEf?OFYU`MC!cVoF^TPCk5;r8B=`qWfGp1!8+x^SmGx6P!Po6BBeOD9f%@HYc%Zaj( zv!X&Pm!Ir%h31Jt79|gsE0;Gdr3B)Cs*RTB?Vp&sMmPIlt=#NLdLyS+6l{JmWV3QY z9iU%-ii&VRzDbd+*lT!0DSz^PZK1FvTu(eNGxE8}j352xsovc3ag|k}5Qga5^+%{G zl&Hnfo2bRPv8d^;jh?ep)dm`DkzQ*YvKbILTg*Zdw|D zT=5e7vMh~I40XKqh;n}N20$L*QrP+7nO2jGTJzpa$qWGwHa~8K#d3Ugkp6@Ba!Sda&0ehu$Iuj3SGUn)@Jlg+K0-~qLfI{RH)-W94Xrb5gb zf7u)yqI#R;Poh6Q$v{fs{}TGK99W~$+EcOqadC0ybbLF!X!P@NhY6n_2o`5p5e65g zN@RLD1MY6V_=MgUypdo8qE8~D4Y!rl_Jy#2c;tnvDfub&HC7+AuEGg9_K67=c98xZ z{Q$hfKV)2ylG5>M!;$V8lG<&^rNl*Yh*(dA>_EEjWP`n)><9^(lel^0^dH~ERfb;u z1911~nsM<=Gt+egdNC)w>+9F8fYrfyQ&ma0dS*8z7TL)nWzMtNJ4{}jXD2Ho3la~@nl@#29v?F0+fw=7k)+jHxPuL%y2hNm2g6*i z%JnuFh>zVe+?eGzZ53d4J0h#h-Ysk~aiFS8$zVJMN2O9%xOM*khvTAl4YYNjzZu=j z7OXZ{$0pj^K8Rm;X;VMwge!i8WnN_rY3rnw9L=uJS;a7zAbyR8n!38WyyC%3v<$|? zJBpHurPL>7^@TM@?eOllGGQ9e>>EX_?MWt)vF~AdS?yMHWB0Zft=9LFj7kzpSRIGj z0zp_aM!j`*fw8c?-5u}NWT2SDDpRUUs2K^p^jPFb}{NIHD0}Hd`DTQg}Y;w&AWn+b4Q$v zFg#A_T)vL)Hp(YwXIzEqYQ04F*!v zpmQUbT6!S4C6%ABo*}3XyvL<08|OOzOC~wx?X%|yso&fFN&TH`=I*Mxzm6= z@?K5?JeXe>@tL^(353UmLZ-Anj0c=Zul^)0*qx5{?6`qM{Nm?LPphjbegqcYN>0+> zU7H6M-JB*gUx`dedgT{G-Cs8LEcE3p>vyE=gzfM8K~PRHmuy5IcB$079s3GyzQuc3 zjqX$uq}apX-CXwR#Oy|`IxUSCV8Yj}fReu7+@#K+FPPAw`mU3Py5B@xCjnpEEh1l1|6}VJ)X)A2E9JR8F zMXN8E+X`V+L6C*fB6%+Bz4)Jc>;F$s)$eJRE-q~wlaglzQL6E9xA?%@@o2+8JG${Fx3863Dp9u)y|0=|X dMxyV;-;Rv=V~$B(68u~4R&YC5jk#a?zX7}~fy)2@ diff --git a/sprites/spr_dread_plasma_cannon/layers/76458a7c-df41-4efe-ac58-2273c4d3e898/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_plasma_cannon/layers/76458a7c-df41-4efe-ac58-2273c4d3e898/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index aa8e541292bdc6a7041d1683cfebb21f0fb35817..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^M}hbS2OE%#=TeXWQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^&T-Kr(75hW>!C8<`)MX5lF!N|bKMAyJr*U&h` z$iT|f)XKm@+rYrez(C^HLtwBWX~@k_$xN%nts!%H`P5I7Xg4c1OTw)4*(!b z0RYvg2i)tHQin_+*4`FybUdqh%zIJ;%fS}qN)xZXvnHPlRX_QmYG-zCRQ58acx6p_ zS*sQsou7A;oAd=bj{8mRS7BXzFqR8+yOjj=knOp-`Xy|XAs6a8fau*OVi zO-eQ0Pup=G+0cMSf%Y(VFDJJOx$?IsF5jKlek{_G5&Oy!PjfTV$d4NQWq~3`)m|kK zO9^xr(*Iel|FiqB!#nR%I+T-d>i^t1QAu8Ok=;i?cBm zW=gh9MOHKy53^tRf2(z`baR>Tu5Mq@ z$7^2;&;*~HNjZnFwDhvlyRy%)0oy%#?O2w*?ce^d6Pn=KU*!2B5?vWzWkpnHk58ApTw+zlLK`lt#GoYsKf!PkLhlj3My8 zsKoumRa$hIF=UL|#t^=LackFY(ds93H{&nEIobw2cJ9qz@NJ1G{OHgsc;H9+EuwU z8>@4@T`4Ikes*Q0#M~mOCuVZ8>#U;sffAG15@ep-Zm2dhGlPf72Z5;1HHL;#ysX5N zT}fqm?VOsXI{)tv_Ltw+37oXu;`8`{S7|Ad9m#xk;x^T6XlPoW86t3DXMR6ishO0IM#Tulu7CA>f`q?L+F-KPd zC60OUXZn#q2OjO?tT)jNt?i#rxZ_&Css`&wP;(jS;znbtf)pNBd*Fm@Vw0cfH68jG zcOma-XvJ*zZeS#L&FvJB$CAjiX5Bk~&jPpagqopI&XZxAdZr+i4xC&fPP9#RW!>0Z zWubeYjPG17u$Nx$)`>7`glfGwMEoZX!}q+z7d;YdVnG5TTk(R`k7kk6Z)E1!UBPX- zd3}9-wCyFgyF|A1G1W!d=bKwvc1IyN3br3D(AsaKbx2}14#A-}L$YW0FM?M(#Vxy6 zu2A~+mbA=&_$gM%sCiTJFYN_ONn~(^Yw#2u8$ezYSfuU2~8;hk*>?&x7*fx32Kx z$B9LRk@E1vCnOEyCU}G#kOwIo$R8*uDBwIB3O3ByOP+Q_gvtKf?nZ1$<1JGdm{)mZ z-(OXaSJ4yF#e^3&YrRZB_wL>{?yJJ^4W*g*mRU{w|mJT zW%QjY2x+EX*wOs14nZ+JG#O!#6ATo(=6@zH#JOToE%(P^rcI<;MqM>|k7nr?s;O?B z(oG!|l;{f-$6O-XlP%R3<|PcD_cUgs%SgjV+BfUdJfEb)X{xpE3!wMiajDQqB(gpnwhyw+AdDEnfvzio*nqtU&GYkg+=A<& z-x4zpgzRW=Y2_US9{!@YUv{HH=xmcou;DwI_#6bhp^qE>oyPzFVr)`VP9!M$q9x2M zuryASg7KsT2T($gK`|jx02m?+jo}C*xPg(YAp&V)f<&0>AP`6dLT&#K>9_blgz(7V s(C-rdnh?tLx-TVY|2G3AG(04h5)dBs*BmQ04Rc(*1IEd=8SS6;A4(i>A^-pY diff --git a/sprites/spr_dread_plasma_cannon/layers/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_plasma_cannon/layers/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index aa8e541292bdc6a7041d1683cfebb21f0fb35817..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^M}hbS2OE%#=TeXWQVPi)LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^&T-Kr(75hW>!C8<`)MX5lF!N|bKMAyJr*U&h` z$iT|f)XKm@+rYrez(C^HLtwBWX~@k_$xN%nts!%Hsh)@PxAlV4Fd`GutIij%JmPZ#bhiw$7X zEf?OFYU`MC!cVoF^TPCk5;r8B=`qWfGp1!8+x^SmGx6P!Po6BBeOD9f%@HYc%Zaj( zv!X&Pm!Ir%h31Jt79|gsE0;Gdr3B)Cs*RTB?Vp&sMmPIlt=#NLdLyS+6l{JmWV3QY z9iU%-ii&VRzDbd+*lT!0DSz^PZK1FvTu(eNGxE8}j352xsovc3ag|k}5Qga5^+%{G zl&Hnfo2bRPv8d^;jh?ep)dm`DkzQ*YvKbILTg*Zdw|D zT=5e7vMh~I40XKqh;n}N20$L*QrP+7nO2jGTJzpa$qWGwHa~8K#d3Ugkp6@Ba!Sda&0ehu$Iuj3SGUn)@Jlg+K0-~qLfI{RH)-W94Xrb5gb zf7u)yqI#R;Poh6Q$v{fs{}TGK99W~$+EcOqadC0ybbLF!X!P@NhY6n_2o`5p5e65g zN@RLD1MY6V_=MgUypdo8qE8~D4Y!rl_Jy#2c;tnvDfub&HC7+AuEGg9_K67=c98xZ z{Q$hfKV)2ylG5>M!;$V8lG<&^rNl*Yh*(dA>_EEjWP`n)><9^(lel^0^dH~ERfb;u z1911~nsM<=Gt+egdNC)w>+9F8fYrfyQ&ma0dS*8z7TL)nWzMtNJ4{}jXD2Ho3la~@nl@#29v?F0+fw=7k)+jHxPuL%y2hNm2g6*i z%JnuFh>zVe+?eGzZ53d4J0h#h-Ysk~aiFS8$zVJMN2O9%xOM*khvTAl4YYNjzZu=j z7OXZ{$0pj^K8Rm;X;VMwge!i8WnN_rY3rnw9L=uJS;a7zAbyR8n!38WyyC%3v<$|? zJBpHurPL>7^@TM@?eOllGGQ9e>>EX_?MWt)vF~AdS?yMHWB0Zft=9LFj7kzpSRIGj z0zp_aM!j`*fw8c?-5u}NWT2SDDpRUUs2K^p^jPFb}{NIHD0}Hd`DTQg}Y;w&AWn+b4Q$v zFg#A_T)vL)Hp(YwXIzEqYQ04F*!v zpmQUbT6!S4C6%ABo*}3XyvL<08|OOzOC~wx?X%|yso&fFN&TH`=I*Mxzm6= z@?K5?JeXe>@tL^(353UmLZ-Anj0c=Zul^)0*qx5{?6`qM{Nm?LPphjbegqcYN>0+> zU7H6M-JB*gUx`dedgT{G-Cs8LEcE3p>vyE=gzfM8K~PRHmuy5IcB$079s3GyzQuc3 zjqX$uq}apX-CXwR#Oy|`IxUSCV8Yj}fReu7+@#K+FPPAw`mU3Py5B@xCjnpEEh1l1|6}VJ)X)A2E9JR8F zMXN8E+X`V+L6C*fB6%+Bz4)Jc>;F$s)$eJRE-q~wlaglzQL6E9xA?%@@o2+8JG${Fx3863Dp9u)y|0=|X dMxyV;-;Rv=V~$B(68u~4R&YC5jk#a?zX7}~fy)2@ diff --git a/sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy b/sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy index f77187eb07..50576110a7 100644 --- a/sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy +++ b/sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy @@ -13,8 +13,6 @@ "For3D":false, "frames":[ {"$GMSpriteFrame":"v1","%Name":"6b155309-549e-4057-b0c0-b879145278ee","name":"6b155309-549e-4057-b0c0-b879145278ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3","name":"e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"76458a7c-df41-4efe-ac58-2273c4d3e898","name":"76458a7c-df41-4efe-ac58-2273c4d3e898","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"3df31b55-fa5a-4b05-995b-1cfbf07f3692","name":"3df31b55-fa5a-4b05-995b-1cfbf07f3692","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, @@ -53,7 +51,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":4.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -67,15 +65,19 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.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":"6b155309-549e-4057-b0c0-b879145278ee","path":"sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e899125-e7fc-420b-992c-b1a32e23760d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3","path":"sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0979e353-07ec-4650-8616-9e9829617ba8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76458a7c-df41-4efe-ac58-2273c4d3e898","path":"sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc68c8a5-de96-40f2-94eb-1182554da373","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3df31b55-fa5a-4b05-995b-1cfbf07f3692","path":"sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d2733b9-23ec-4b2e-8af3-44b12da58cf6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b155309-549e-4057-b0c0-b879145278ee","path":"sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9e899125-e7fc-420b-992c-b1a32e23760d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3df31b55-fa5a-4b05-995b-1cfbf07f3692","path":"sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6d2733b9-23ec-4b2e-8af3-44b12da58cf6","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, From 65ea076ece3533e89674babe850f9194987f599c Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 23 Aug 2025 03:46:03 +0100 Subject: [PATCH 2/3] tabs in mass equip --- scripts/scr_ui_settings/scr_ui_settings.gml | 24 ++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/scr_ui_settings/scr_ui_settings.gml b/scripts/scr_ui_settings/scr_ui_settings.gml index e86c4e1648..3fd0672d85 100644 --- a/scripts/scr_ui_settings/scr_ui_settings.gml +++ b/scripts/scr_ui_settings/scr_ui_settings.gml @@ -345,25 +345,25 @@ function scr_ui_settings() { x5 = xx + 830; y5 = yy + 207 - spacing; - for (var gg = 1; gg <= 5; gg++) { + for (var gg = 0; gg <= 4; gg++) { y5 += spacing; - if (gg == 1) { + if (gg == 0) { title = "Main Weapon: "; geh = obj_ini.wep1[co, ide]; } - if (gg == 2) { + if (gg == 1) { title = "Secondary Weapon: "; geh = obj_ini.wep2[co, ide]; } - if (gg == 3) { + if (gg == 2) { title = "Armour: "; geh = obj_ini.armour[co, ide]; } - if (gg == 4) { + if (gg == 3) { title = "Special Item: "; geh = obj_ini.gear[co, ide]; } - if (gg == 5) { + if (gg == 4) { title = "Mobility Item: "; geh = obj_ini.mobi[co, ide]; } @@ -381,25 +381,25 @@ function scr_ui_settings() { var nep = false; - if (((obj_ini.armour[co, ide] == "Terminator Armour") || (obj_ini.armour[co, ide] == "Dreadnought")) && (gg == 4)) { + if (((obj_ini.armour[co, ide] == "Terminator Armour") || (obj_ini.armour[co, ide] == "Dreadnought")) && (gg == 3)) { nep = true; } - if ((ide == 6) && ((gg == 3) || (gg == 5))) { + if ((ide == 6) && ((gg == 2) || (gg == 4))) { nep = true; } if (scr_click_left() && !nep) { - if (obj_mass_equip.tab != 0) { + if (obj_mass_equip.tab != -1) { obj_mass_equip.refresh = true; - } else if (obj_mass_equip.tab == 0) { + } else if (obj_mass_equip.tab == -1) { obj_mass_equip.tab = gg; obj_mass_equip.item_name = []; - var is_hand_slot = gg == 1 || gg == 2; + var is_hand_slot = gg == 0 || gg == 1; scr_get_item_names( obj_mass_equip.item_name, obj_controller.settings, // eROLE gg, // slot - is_hand_slot ? (obj_mass_equip.tab == 1 ? eENGAGEMENT.Ranged : eENGAGEMENT.Melee) : eENGAGEMENT.None, + is_hand_slot ? (obj_mass_equip.tab == 0 ? eENGAGEMENT.Ranged : eENGAGEMENT.Melee) : eENGAGEMENT.None, true, // include company standard false, // show all regardless of inventory From f4e33262c590d0da77eddedf60a93ba12ca98589 Mon Sep 17 00:00:00 2001 From: Nelsonh Date: Sat, 23 Aug 2025 04:15:33 +0100 Subject: [PATCH 3/3] review fixes --- scripts/scr_buttons/scr_buttons.gml | 4 ++-- scripts/scr_ui_manage/scr_ui_manage.gml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/scr_buttons/scr_buttons.gml b/scripts/scr_buttons/scr_buttons.gml index 59008f816e..c1b3d9df95 100644 --- a/scripts/scr_buttons/scr_buttons.gml +++ b/scripts/scr_buttons/scr_buttons.gml @@ -75,7 +75,7 @@ function ReactiveString(text,x1=0,y1=0,data = false) constructor{ draw_set_color(colour); if (max_width>-1){ - draw_text_ext_outline(x1, y1, text, -1, 187, 0, c_black, colour); + draw_text_ext_outline(x1, y1, text, -1, max_width, 0, c_black, colour); } else { draw_text_outline(x1, y1, text, c_black, colour); } @@ -114,7 +114,7 @@ function LabeledIcon(icon, text,x1=0,y1=0,data = false) constructor{ add_draw_return_values(); draw_set_font(font); if (text_position == "right"){ - w = x1 + icon_width + 2 + string_width(text);; + w = icon_width + 2 + string_width(text);; x2 = x1 + w; h = icon_height; y2 = y1 + icon_height; diff --git a/scripts/scr_ui_manage/scr_ui_manage.gml b/scripts/scr_ui_manage/scr_ui_manage.gml index 007cc4ec9e..7bfe7af9b0 100644 --- a/scripts/scr_ui_manage/scr_ui_manage.gml +++ b/scripts/scr_ui_manage/scr_ui_manage.gml @@ -174,7 +174,7 @@ function reset_manage_unit_constants(unit){ unit_manage_constants.mobi_string = new ReactiveString(unit.equipments_qual_string("mobi", true), 0,0,_data); var _data = { - tooltip : $"==First Weapon==\n{is_struct(equip_data.gear_data) ? equip_data.gear_data.item_tooltip_desc_gen() : ""}", + tooltip : $"==First Weapon==\n{is_struct(equip_data.weapon_one_data) ? equip_data.weapon_one_data.item_tooltip_desc_gen() : ""}", colour : quality_color(unit.weapon_one_quality), max_width : 187, } @@ -183,7 +183,7 @@ function reset_manage_unit_constants(unit){ //mobility var _data = { - tooltip : $"==Second Weapon==\n{is_struct(equip_data.mobility_data) ? equip_data.mobility_data.item_tooltip_desc_gen() : ""}", + tooltip : $"==Second Weapon==\n{is_struct(equip_data.weapon_two_data) ? equip_data.weapon_two_data.item_tooltip_desc_gen() : ""}", colour : quality_color(unit.weapon_two_quality), max_width : 187, }