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..c1b3d9df95 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, max_width, 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{ @@ -51,8 +114,8 @@ 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);; - x2 = w; + w = icon_width + 2 + string_width(text);; + 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..7bfe7af9b0 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.weapon_one_data) ? equip_data.weapon_one_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.weapon_two_data) ? equip_data.weapon_two_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/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 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 f2bc367bc2..0000000000 Binary files a/sprites/spr_dread_assault_cannon/ca9af1f8-d9c1-4f87-b306-8aaff6acf541.png and /dev/null differ 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 a92a9c65d0..0000000000 Binary files a/sprites/spr_dread_assault_cannon/dd7d5c23-a6af-4857-8741-b07293907895.png and /dev/null differ 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 3758dd29be..0000000000 Binary files a/sprites/spr_dread_assault_cannon/layers/ca9af1f8-d9c1-4f87-b306-8aaff6acf541/5f4f0795-cb93-46e3-9a51-5771616e403f.png and /dev/null differ 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 189fecdf4d..0000000000 Binary files a/sprites/spr_dread_assault_cannon/layers/ca9af1f8-d9c1-4f87-b306-8aaff6acf541/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ 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 a92a9c65d0..0000000000 Binary files a/sprites/spr_dread_assault_cannon/layers/dd7d5c23-a6af-4857-8741-b07293907895/5f4f0795-cb93-46e3-9a51-5771616e403f.png and /dev/null differ 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 189fecdf4d..0000000000 Binary files a/sprites/spr_dread_assault_cannon/layers/dd7d5c23-a6af-4857-8741-b07293907895/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ 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 bd8d3dc7fe..0000000000 Binary files a/sprites/spr_dread_autocannon/430ba383-8c34-4c5c-a443-2005ddb354ff.png and /dev/null differ diff --git a/sprites/spr_dread_autocannon/6692383a-0d7e-4194-998f-fc3bf2067f77.png b/sprites/spr_dread_autocannon/6692383a-0d7e-4194-998f-fc3bf2067f77.png deleted file mode 100644 index 9353d317b6..0000000000 Binary files a/sprites/spr_dread_autocannon/6692383a-0d7e-4194-998f-fc3bf2067f77.png and /dev/null differ diff --git a/sprites/spr_dread_autocannon/layers/430ba383-8c34-4c5c-a443-2005ddb354ff/9093f3a1-b3fd-4c9b-af10-612dea29d004.png b/sprites/spr_dread_autocannon/layers/430ba383-8c34-4c5c-a443-2005ddb354ff/9093f3a1-b3fd-4c9b-af10-612dea29d004.png deleted file mode 100644 index bd8d3dc7fe..0000000000 Binary files a/sprites/spr_dread_autocannon/layers/430ba383-8c34-4c5c-a443-2005ddb354ff/9093f3a1-b3fd-4c9b-af10-612dea29d004.png and /dev/null differ diff --git a/sprites/spr_dread_autocannon/layers/6692383a-0d7e-4194-998f-fc3bf2067f77/9093f3a1-b3fd-4c9b-af10-612dea29d004.png b/sprites/spr_dread_autocannon/layers/6692383a-0d7e-4194-998f-fc3bf2067f77/9093f3a1-b3fd-4c9b-af10-612dea29d004.png deleted file mode 100644 index 9353d317b6..0000000000 Binary files a/sprites/spr_dread_autocannon/layers/6692383a-0d7e-4194-998f-fc3bf2067f77/9093f3a1-b3fd-4c9b-af10-612dea29d004.png and /dev/null differ diff --git a/sprites/spr_dread_autocannon/spr_dread_autocannon.yy b/sprites/spr_dread_autocannon/spr_dread_autocannon.yy index 42e419b959..543c67b764 100644 --- a/sprites/spr_dread_autocannon/spr_dread_autocannon.yy +++ b/sprites/spr_dread_autocannon/spr_dread_autocannon.yy @@ -13,8 +13,6 @@ "For3D":false, "frames":[ {"$GMSpriteFrame":"v1","%Name":"745b9ec2-90a6-4381-a7d8-db8fb386297b","name":"745b9ec2-90a6-4381-a7d8-db8fb386297b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"430ba383-8c34-4c5c-a443-2005ddb354ff","name":"430ba383-8c34-4c5c-a443-2005ddb354ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"6692383a-0d7e-4194-998f-fc3bf2067f77","name":"6692383a-0d7e-4194-998f-fc3bf2067f77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"2567bd58-d13d-4cd9-9979-937b4d54e288","name":"2567bd58-d13d-4cd9-9979-937b4d54e288","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, @@ -52,7 +50,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":4.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -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 e36bcc888a..0000000000 Binary files a/sprites/spr_dread_claw/c66f97c4-ce8b-427b-8ab0-baac7d95dda9.png and /dev/null differ 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 6fdaf272c3..0000000000 Binary files a/sprites/spr_dread_claw/edc36065-c8cc-48b7-b999-6a9a9665befa.png and /dev/null differ diff --git a/sprites/spr_dread_claw/layers/c66f97c4-ce8b-427b-8ab0-baac7d95dda9/0a188212-4756-437d-9b06-5ec78990fa63.png b/sprites/spr_dread_claw/layers/c66f97c4-ce8b-427b-8ab0-baac7d95dda9/0a188212-4756-437d-9b06-5ec78990fa63.png deleted file mode 100644 index e36bcc888a..0000000000 Binary files a/sprites/spr_dread_claw/layers/c66f97c4-ce8b-427b-8ab0-baac7d95dda9/0a188212-4756-437d-9b06-5ec78990fa63.png and /dev/null differ 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 6fdaf272c3..0000000000 Binary files a/sprites/spr_dread_claw/layers/edc36065-c8cc-48b7-b999-6a9a9665befa/0a188212-4756-437d-9b06-5ec78990fa63.png and /dev/null differ diff --git a/sprites/spr_dread_claw/spr_dread_claw.yy b/sprites/spr_dread_claw/spr_dread_claw.yy index 761f0f75bb..b67900d3ad 100644 --- a/sprites/spr_dread_claw/spr_dread_claw.yy +++ b/sprites/spr_dread_claw/spr_dread_claw.yy @@ -13,8 +13,6 @@ "For3D":false, "frames":[ {"$GMSpriteFrame":"v1","%Name":"6a74ce9f-a9b4-4216-a14f-8b9414602232","name":"6a74ce9f-a9b4-4216-a14f-8b9414602232","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"c66f97c4-ce8b-427b-8ab0-baac7d95dda9","name":"c66f97c4-ce8b-427b-8ab0-baac7d95dda9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"edc36065-c8cc-48b7-b999-6a9a9665befa","name":"edc36065-c8cc-48b7-b999-6a9a9665befa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, @@ -52,7 +50,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":4.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -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 369fc954b1..0000000000 Binary files a/sprites/spr_dread_heavy_bolter/9fa15ed7-cd79-4acd-83d9-95ecf0be332f.png and /dev/null differ 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 e68b69e23c..0000000000 Binary files a/sprites/spr_dread_heavy_bolter/b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6.png and /dev/null differ diff --git a/sprites/spr_dread_heavy_bolter/layers/9fa15ed7-cd79-4acd-83d9-95ecf0be332f/8032ff11-29ed-4780-ac80-92b6e1c5e7aa.png b/sprites/spr_dread_heavy_bolter/layers/9fa15ed7-cd79-4acd-83d9-95ecf0be332f/8032ff11-29ed-4780-ac80-92b6e1c5e7aa.png deleted file mode 100644 index 369fc954b1..0000000000 Binary files a/sprites/spr_dread_heavy_bolter/layers/9fa15ed7-cd79-4acd-83d9-95ecf0be332f/8032ff11-29ed-4780-ac80-92b6e1c5e7aa.png and /dev/null differ 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 e68b69e23c..0000000000 Binary files a/sprites/spr_dread_heavy_bolter/layers/b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6/8032ff11-29ed-4780-ac80-92b6e1c5e7aa.png and /dev/null differ diff --git a/sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy b/sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy index 3d28dbcc67..6c9899737d 100644 --- a/sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy +++ b/sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy @@ -13,8 +13,6 @@ "For3D":false, "frames":[ {"$GMSpriteFrame":"v1","%Name":"0e84c437-f0a8-4de3-a069-030fbbde3c3a","name":"0e84c437-f0a8-4de3-a069-030fbbde3c3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"9fa15ed7-cd79-4acd-83d9-95ecf0be332f","name":"9fa15ed7-cd79-4acd-83d9-95ecf0be332f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6","name":"b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"d244aeeb-dbac-49cb-ba6a-cc8c95d420f4","name":"d244aeeb-dbac-49cb-ba6a-cc8c95d420f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, @@ -52,7 +50,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":4.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -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 e39b6ca84c..0000000000 Binary files a/sprites/spr_dread_iron_clad/eb254b9d-bb2c-41f8-9e62-ad9069c99560.png and /dev/null differ diff --git a/sprites/spr_dread_iron_clad/f5bd9088-45e5-4695-a241-41e7835f44fd.png b/sprites/spr_dread_iron_clad/f5bd9088-45e5-4695-a241-41e7835f44fd.png deleted file mode 100644 index 3119a98c1e..0000000000 Binary files a/sprites/spr_dread_iron_clad/f5bd9088-45e5-4695-a241-41e7835f44fd.png and /dev/null differ 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 e39b6ca84c..0000000000 Binary files a/sprites/spr_dread_iron_clad/layers/eb254b9d-bb2c-41f8-9e62-ad9069c99560/750c31f7-7377-4a6c-809a-4f9444c3a1e7.png and /dev/null differ diff --git a/sprites/spr_dread_iron_clad/layers/eb254b9d-bb2c-41f8-9e62-ad9069c99560/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_iron_clad/layers/eb254b9d-bb2c-41f8-9e62-ad9069c99560/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index 5bda11e038..0000000000 Binary files a/sprites/spr_dread_iron_clad/layers/eb254b9d-bb2c-41f8-9e62-ad9069c99560/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ diff --git a/sprites/spr_dread_iron_clad/layers/f5bd9088-45e5-4695-a241-41e7835f44fd/750c31f7-7377-4a6c-809a-4f9444c3a1e7.png b/sprites/spr_dread_iron_clad/layers/f5bd9088-45e5-4695-a241-41e7835f44fd/750c31f7-7377-4a6c-809a-4f9444c3a1e7.png deleted file mode 100644 index 3119a98c1e..0000000000 Binary files a/sprites/spr_dread_iron_clad/layers/f5bd9088-45e5-4695-a241-41e7835f44fd/750c31f7-7377-4a6c-809a-4f9444c3a1e7.png and /dev/null differ 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 5bda11e038..0000000000 Binary files a/sprites/spr_dread_iron_clad/layers/f5bd9088-45e5-4695-a241-41e7835f44fd/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ diff --git a/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy b/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy index 2d8280e01f..de449dec94 100644 --- a/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy +++ b/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy @@ -13,8 +13,6 @@ "For3D":false, "frames":[ {"$GMSpriteFrame":"v1","%Name":"659ee02b-897e-4104-b145-c359f7650d83","name":"659ee02b-897e-4104-b145-c359f7650d83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"f5bd9088-45e5-4695-a241-41e7835f44fd","name":"f5bd9088-45e5-4695-a241-41e7835f44fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"v1","%Name":"eb254b9d-bb2c-41f8-9e62-ad9069c99560","name":"eb254b9d-bb2c-41f8-9e62-ad9069c99560","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, {"$GMSpriteFrame":"v1","%Name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, @@ -53,7 +51,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":4.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -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 936b86fe3e..0000000000 Binary files a/sprites/spr_dread_lascannon/48994d0c-01f0-441c-9383-c0eafe9cae39.png and /dev/null differ 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 e0a62c0c9e..0000000000 Binary files a/sprites/spr_dread_lascannon/fc539d0b-b559-4265-95a9-df8bac65ea2b.png and /dev/null differ diff --git a/sprites/spr_dread_lascannon/layers/48994d0c-01f0-441c-9383-c0eafe9cae39/1d4cccd9-bb49-4325-8933-45f465f70841.png b/sprites/spr_dread_lascannon/layers/48994d0c-01f0-441c-9383-c0eafe9cae39/1d4cccd9-bb49-4325-8933-45f465f70841.png deleted file mode 100644 index 936b86fe3e..0000000000 Binary files a/sprites/spr_dread_lascannon/layers/48994d0c-01f0-441c-9383-c0eafe9cae39/1d4cccd9-bb49-4325-8933-45f465f70841.png and /dev/null differ 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 70e3813055..0000000000 Binary files a/sprites/spr_dread_lascannon/layers/48994d0c-01f0-441c-9383-c0eafe9cae39/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ 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 e0a62c0c9e..0000000000 Binary files a/sprites/spr_dread_lascannon/layers/fc539d0b-b559-4265-95a9-df8bac65ea2b/1d4cccd9-bb49-4325-8933-45f465f70841.png and /dev/null differ diff --git a/sprites/spr_dread_lascannon/layers/fc539d0b-b559-4265-95a9-df8bac65ea2b/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_lascannon/layers/fc539d0b-b559-4265-95a9-df8bac65ea2b/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index 70e3813055..0000000000 Binary files a/sprites/spr_dread_lascannon/layers/fc539d0b-b559-4265-95a9-df8bac65ea2b/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ 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 85c907add0..0000000000 Binary files a/sprites/spr_dread_missile/098fd89a-d321-4251-b0f3-70132fea3997.png and /dev/null differ diff --git a/sprites/spr_dread_missile/7fa6bc12-162e-4538-92df-3bc73caec0ee.png b/sprites/spr_dread_missile/7fa6bc12-162e-4538-92df-3bc73caec0ee.png deleted file mode 100644 index 4295cdcab0..0000000000 Binary files a/sprites/spr_dread_missile/7fa6bc12-162e-4538-92df-3bc73caec0ee.png and /dev/null differ 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 8833551f74..0000000000 Binary files a/sprites/spr_dread_missile/layers/098fd89a-d321-4251-b0f3-70132fea3997/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ diff --git a/sprites/spr_dread_missile/layers/098fd89a-d321-4251-b0f3-70132fea3997/c8fad8b0-70d6-45c8-a8ed-2c1e3cb3673e.png b/sprites/spr_dread_missile/layers/098fd89a-d321-4251-b0f3-70132fea3997/c8fad8b0-70d6-45c8-a8ed-2c1e3cb3673e.png deleted file mode 100644 index 85c907add0..0000000000 Binary files a/sprites/spr_dread_missile/layers/098fd89a-d321-4251-b0f3-70132fea3997/c8fad8b0-70d6-45c8-a8ed-2c1e3cb3673e.png and /dev/null differ diff --git a/sprites/spr_dread_missile/layers/7fa6bc12-162e-4538-92df-3bc73caec0ee/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_missile/layers/7fa6bc12-162e-4538-92df-3bc73caec0ee/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index 5bda11e038..0000000000 Binary files a/sprites/spr_dread_missile/layers/7fa6bc12-162e-4538-92df-3bc73caec0ee/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ diff --git a/sprites/spr_dread_missile/layers/7fa6bc12-162e-4538-92df-3bc73caec0ee/c8fad8b0-70d6-45c8-a8ed-2c1e3cb3673e.png b/sprites/spr_dread_missile/layers/7fa6bc12-162e-4538-92df-3bc73caec0ee/c8fad8b0-70d6-45c8-a8ed-2c1e3cb3673e.png deleted file mode 100644 index 4295cdcab0..0000000000 Binary files a/sprites/spr_dread_missile/layers/7fa6bc12-162e-4538-92df-3bc73caec0ee/c8fad8b0-70d6-45c8-a8ed-2c1e3cb3673e.png and /dev/null differ 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 abfda67832..0000000000 Binary files a/sprites/spr_dread_plasma_cannon/76458a7c-df41-4efe-ac58-2273c4d3e898.png and /dev/null differ 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 ef4e22db81..0000000000 Binary files a/sprites/spr_dread_plasma_cannon/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3.png and /dev/null differ 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 aa8e541292..0000000000 Binary files a/sprites/spr_dread_plasma_cannon/layers/76458a7c-df41-4efe-ac58-2273c4d3e898/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ diff --git a/sprites/spr_dread_plasma_cannon/layers/76458a7c-df41-4efe-ac58-2273c4d3e898/ccd559cd-c323-4e0f-b733-5bf644ca1b41.png b/sprites/spr_dread_plasma_cannon/layers/76458a7c-df41-4efe-ac58-2273c4d3e898/ccd559cd-c323-4e0f-b733-5bf644ca1b41.png deleted file mode 100644 index abfda67832..0000000000 Binary files a/sprites/spr_dread_plasma_cannon/layers/76458a7c-df41-4efe-ac58-2273c4d3e898/ccd559cd-c323-4e0f-b733-5bf644ca1b41.png and /dev/null differ 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 aa8e541292..0000000000 Binary files a/sprites/spr_dread_plasma_cannon/layers/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ diff --git a/sprites/spr_dread_plasma_cannon/layers/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3/ccd559cd-c323-4e0f-b733-5bf644ca1b41.png b/sprites/spr_dread_plasma_cannon/layers/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3/ccd559cd-c323-4e0f-b733-5bf644ca1b41.png deleted file mode 100644 index ef4e22db81..0000000000 Binary files a/sprites/spr_dread_plasma_cannon/layers/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3/ccd559cd-c323-4e0f-b733-5bf644ca1b41.png and /dev/null differ 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,